diff --git a/app/electron/main.js b/app/electron/main.js index 1268e2b21..9a41ae449 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -737,6 +737,13 @@ app.whenReady().then(() => { break; case "setProxy": event.sender.session.closeAllConnections().then(() => { + if (data.proxyURL.startsWith("://")) { + event.sender.session.setProxy({mode: "system"}).then(() => { + console.log("network proxy [system]"); + }); + return; + } + event.sender.session.setProxy({proxyRules: data.proxyURL}).then(() => { console.log("network proxy [" + data.proxyURL + "]"); }); diff --git a/app/src/config/util/about.ts b/app/src/config/util/about.ts index f07ed67ea..65e7784f9 100644 --- a/app/src/config/util/about.ts +++ b/app/src/config/util/about.ts @@ -8,10 +8,6 @@ import {Constants} from "../../constants"; export const setProxy = () => { /// #if !BROWSER - if ("" === window.siyuan.config.system.networkProxy.scheme) { - console.log("network proxy [system]"); - return; - } ipcRenderer.send(Constants.SIYUAN_CMD, { cmd: "setProxy", proxyURL: `${window.siyuan.config.system.networkProxy.scheme}://${window.siyuan.config.system.networkProxy.host}:${window.siyuan.config.system.networkProxy.port}`