0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-10-09 01:24:40 +08:00
commit 179b6f30fd
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/electron/main.js
View file

@ -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 + "]");
});

4
app/src/config/account.ts
View file

@ -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;
}

4
app/src/config/util/about.ts
View file

@ -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}`

4
app/src/mobile/settings/account.ts
View file

@ -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;
}