From 13831771d05e8be16dea0114d043e47396d09ab0 Mon Sep 17 00:00:00 2001 From: likexuan Date: Sun, 24 Apr 2022 09:37:55 +0800 Subject: [PATCH 1/3] Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 --- nezha-fronted/build/webpack.dev.conf.js | 2 +- nezha-fronted/build/webpack.prod.conf.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js index b9343e8db..3c79326bf 100644 --- a/nezha-fronted/build/webpack.dev.conf.js +++ b/nezha-fronted/build/webpack.dev.conf.js @@ -55,7 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { new webpack.NoEmitOnErrorsPlugin(), // https://github.com/ampedandwired/html-webpack-plugin new HtmlWebpackPlugin({ - favicon: require('../src/assets/img/favicon.ico'), + favicon: path.resolve(__dirname, '../src/assets/img/favicon.ico'), filename: 'index.html', template: 'index.html', inject: true diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index 1f2600c43..b3d516e39 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -91,7 +91,7 @@ const webpackConfig = merge(baseWebpackConfig, { // you can customize output by editing /index.html // see https://github.com/ampedandwired/html-webpack-plugin new HtmlWebpackPlugin({ - favicon: require('../src/assets/img/favicon.ico'), + favicon: path.resolve(__dirname, '../src/assets/img/favicon.ico'), filename: config.build.index, template: 'index.html', hash: false, From 88f6e09b7f3cf6336eb54e9435d518efc0b5fe1d Mon Sep 17 00:00:00 2001 From: likexuan Date: Sun, 24 Apr 2022 09:38:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?NEZ-1830=20fix=20:=20Network=20Zodiac=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AFlogo=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/static/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json index 5f74f5d01..abcddc473 100644 --- a/nezha-fronted/static/config.json +++ b/nezha-fronted/static/config.json @@ -1 +1 @@ -{"baseUrl":"/", "version": "21.04"} +{"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"} From 403e309600a5d0e06996e7faacdd3a7887c46fc0 Mon Sep 17 00:00:00 2001 From: likexuan Date: Sun, 24 Apr 2022 09:41:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?NEZ-1830=20fix=20:=20Network=20Zodiac=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AFlogo=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/static/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json index abcddc473..5f74f5d01 100644 --- a/nezha-fronted/static/config.json +++ b/nezha-fronted/static/config.json @@ -1 +1 @@ -{"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"} +{"baseUrl":"/", "version": "21.04"}