From 90ea0dc857462a6d60ceccd9ecb805f69e67e410 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 29 May 2022 10:48:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=A2=AB=E6=9B=BF=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build-config/renderer/webpack.config.dev.js  | 1 +
 build-config/renderer/webpack.config.prod.js | 1 +
 src/renderer/core/useApp/index.js            | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-config/renderer/webpack.config.dev.js b/build-config/renderer/webpack.config.dev.js
index fba6e3fa..70d39f8d 100644
--- a/build-config/renderer/webpack.config.dev.js
+++ b/build-config/renderer/webpack.config.dev.js
@@ -14,6 +14,7 @@ module.exports = merge(baseConfig, {
         NODE_ENV: '"development"',
         ELECTRON_DISABLE_SECURITY_WARNINGS: 'true',
       },
+      ENVIRONMENT: 'process.env',
       __VUE_OPTIONS_API__: 'true',
       __VUE_PROD_DEVTOOLS__: 'false',
       __static: `"${path.join(__dirname, '../../src/static').replace(/\\/g, '\\\\')}"`,
diff --git a/build-config/renderer/webpack.config.prod.js b/build-config/renderer/webpack.config.prod.js
index 9ee5ebb8..6eb3a534 100644
--- a/build-config/renderer/webpack.config.prod.js
+++ b/build-config/renderer/webpack.config.prod.js
@@ -31,6 +31,7 @@ module.exports = merge(baseConfig, {
       'process.env': {
         NODE_ENV: '"production"',
       },
+      ENVIRONMENT: 'process.env',
       __VUE_OPTIONS_API__: 'true',
       __VUE_PROD_DEVTOOLS__: 'false',
     }),
diff --git a/src/renderer/core/useApp/index.js b/src/renderer/core/useApp/index.js
index 68671fe9..a486748d 100644
--- a/src/renderer/core/useApp/index.js
+++ b/src/renderer/core/useApp/index.js
@@ -53,7 +53,8 @@ export default () => {
 
   getEnvParams().then(envParams => {
     // 移除代理相关的环境变量设置，防止请求库自动应用它们
-    for (const key of Object.keys(process.env)) {
+    // eslint-disable-next-line no-undef
+    for (const key of Object.keys(ENVIRONMENT)) {
       if (/^(?:http_proxy|https_proxy|NO_PROXY)$/i.test(key)) delete process.env[key]
     }
     const envProxy = envParams.cmdParams['proxy-server']