diff --git a/app/electron/main.js b/app/electron/main.js index 737815f5e..fdc770746 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -789,6 +789,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/account.ts b/app/src/config/account.ts index 0af15aa31..91f2754da 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -328,7 +328,7 @@ ${renewHTML} let token: string; let needCaptcha: string; captchaImgElement.addEventListener("click", () => { - captchaImgElement.setAttribute("src", `https://ld246.com/captcha/login?needCaptcha=${needCaptcha}&t=${new Date().getTime()}`); + captchaImgElement.setAttribute("src", getCloudURL("captcha") + `/login?needCaptcha=${needCaptcha}&t=${new Date().getTime()}`); }); const cloudRegionElement = element.querySelector("#cloudRegion") as HTMLSelectElement; @@ -354,7 +354,7 @@ ${renewHTML} needCaptcha = data.data.needCaptcha; captchaElement.parentElement.classList.remove("fn__none"); captchaElement.previousElementSibling.setAttribute("src", - `https://ld246.com/captcha/login?needCaptcha=${data.data.needCaptcha}`); + getCloudURL("captcha") + `/login?needCaptcha=${data.data.needCaptcha}`); captchaElement.value = ""; return; } 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}` diff --git a/app/src/mobile/settings/account.ts b/app/src/mobile/settings/account.ts index ba08f7323..e3387a2e9 100644 --- a/app/src/mobile/settings/account.ts +++ b/app/src/mobile/settings/account.ts @@ -200,7 +200,7 @@ const bindLoginEvent = (modelMainElement: HTMLElement, deactive = false) => { }); } captchaImgElement.addEventListener("click", () => { - captchaImgElement.setAttribute("src", `https://ld246.com/captcha/login?needCaptcha=${needCaptcha}&t=${new Date().getTime()}`); + captchaImgElement.setAttribute("src", getCloudURL("captcha") + `/login?needCaptcha=${needCaptcha}&t=${new Date().getTime()}`); }); const cloudRegionElement = modelMainElement.querySelector("#cloudRegion") as HTMLSelectElement; @@ -226,7 +226,7 @@ const bindLoginEvent = (modelMainElement: HTMLElement, deactive = false) => { needCaptcha = data.data.needCaptcha; captchaElement.parentElement.classList.remove("fn__none"); captchaElement.previousElementSibling.setAttribute("src", - `https://ld246.com/captcha/login?needCaptcha=${data.data.needCaptcha}`); + getCloudURL("captcha") + `/login?needCaptcha=${data.data.needCaptcha}`); captchaElement.value = ""; return; }