Daniel 1 éve
szülő
commit
b589a93f13
2 módosított fájl, 7 hozzáadás és 4 törlés
  1. 7 0
      app/electron/main.js
  2. 0 4
      app/src/config/util/about.ts

+ 7 - 0
app/electron/main.js

@@ -737,6 +737,13 @@ app.whenReady().then(() => {
                 break;
                 break;
             case "setProxy":
             case "setProxy":
                 event.sender.session.closeAllConnections().then(() => {
                 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(() => {
                     event.sender.session.setProxy({proxyRules: data.proxyURL}).then(() => {
                         console.log("network proxy [" + data.proxyURL + "]");
                         console.log("network proxy [" + data.proxyURL + "]");
                     });
                     });

+ 0 - 4
app/src/config/util/about.ts

@@ -8,10 +8,6 @@ import {Constants} from "../../constants";
 
 
 export const setProxy = () => {
 export const setProxy = () => {
     /// #if !BROWSER
     /// #if !BROWSER
-    if ("" === window.siyuan.config.system.networkProxy.scheme) {
-        console.log("network proxy [system]");
-        return;
-    }
     ipcRenderer.send(Constants.SIYUAN_CMD, {
     ipcRenderer.send(Constants.SIYUAN_CMD, {
         cmd: "setProxy",
         cmd: "setProxy",
         proxyURL: `${window.siyuan.config.system.networkProxy.scheme}://${window.siyuan.config.system.networkProxy.host}:${window.siyuan.config.system.networkProxy.port}`
         proxyURL: `${window.siyuan.config.system.networkProxy.scheme}://${window.siyuan.config.system.networkProxy.host}:${window.siyuan.config.system.networkProxy.port}`