diff --git a/packages/core/src/modules/proxy/index.js b/packages/core/src/modules/proxy/index.js index 7ce7b90..59f85d2 100644 --- a/packages/core/src/modules/proxy/index.js +++ b/packages/core/src/modules/proxy/index.js @@ -54,6 +54,7 @@ module.exports = { name: '系统代理', use: 'local', other: [], + proxyHttp: true, setEnv: false, excludeIpList: { // region 常用国内可访问域名 diff --git a/packages/core/src/shell/scripts/set-system-proxy/index.js b/packages/core/src/shell/scripts/set-system-proxy/index.js index 4cb259f..f60703b 100644 --- a/packages/core/src/shell/scripts/set-system-proxy/index.js +++ b/packages/core/src/shell/scripts/set-system-proxy/index.js @@ -50,7 +50,11 @@ async function _winSetProxy (exec, ip, port, setEnv) { const proxyPath = extraPath.getProxyExePath() const execFun = 'global' - const proxyAddr = `http=http://${ip}:${port};https=http://${ip}:${port}` + let proxyAddr = `https=http://${ip}:${port}` + if (config.get().proxy.proxyHttp !== false) { + proxyAddr = `http=http://${ip}:${port};` + proxyAddr + } + log.info(`执行“设置系统代理”的程序: ${proxyPath} ${execFun} ${proxyAddr} ......(省略排除IP列表)`) await execFile(proxyPath, [execFun, proxyAddr, excludeIpStr]) diff --git a/packages/gui/src/view/pages/proxy.vue b/packages/gui/src/view/pages/proxy.vue index 047d31b..6719135 100644 --- a/packages/gui/src/view/pages/proxy.vue +++ b/packages/gui/src/view/pages/proxy.vue @@ -21,6 +21,14 @@ 卸载与恢复网络说明 + + + 是否代理HTTP请求 + +
+ 勾选时,同时代理HTTP和HTTPS请求;不勾选时,只代理HTTPS请求 +
+
是否同时修改HTTPS_PROXY环境变量(不好用,不建议勾选)