diff --git a/app/electron/main.js b/app/electron/main.js index dc4e3ba40..fca505e60 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -297,10 +297,10 @@ const boot = () => { currentWindow.webContents.userAgent = "SiYuan/" + appVer + " https://b3log.org/siyuan Electron " + currentWindow.webContents.userAgent; // set proxy - net.fetch(getServer() + "/api/system/getConf", {method: "POST"}).then((response) => { + net.fetch(getServer() + "/api/system/getNetwork", {method: "POST"}).then((response) => { return response.json(); }).then((response) => { - setProxy(`${response.data.conf.system.networkProxy.scheme}://${response.data.conf.system.networkProxy.host}:${response.data.conf.system.networkProxy.port}`, currentWindow.webContents).then(() => { + setProxy(`${response.data.proxy.scheme}://${response.data.proxy.host}:${response.data.proxy.port}`, currentWindow.webContents).then(() => { // 加载主界面 currentWindow.loadURL(getServer() + "/stage/build/app/index.html?v=" + new Date().getTime()); }); diff --git a/kernel/api/router.go b/kernel/api/router.go index 984d944fa..6b8a3ad7d 100644 --- a/kernel/api/router.go +++ b/kernel/api/router.go @@ -34,7 +34,7 @@ func ServeAPI(ginServer *gin.Engine) { ginServer.Handle("POST", "/api/system/logoutAuth", model.LogoutAuth) ginServer.Handle("GET", "/api/system/getCaptcha", model.GetCaptcha) ginServer.Handle("POST", "/api/system/setUILayout", setUILayout) // 这里不加鉴权 After modifying the access authentication code on the browser side, the other side does not refresh https://github.com/siyuan-note/siyuan/issues/8028 - + ginServer.Handle("POST", "/api/system/getNetwork", getNetwork) // 启动时获取网络设置,不能加鉴权 ginServer.Handle("GET", "/snippets/*filepath", serveSnippets) // 需要鉴权 diff --git a/kernel/api/system.go b/kernel/api/system.go index 857ea4fe1..ada8eaa1d 100644 --- a/kernel/api/system.go +++ b/kernel/api/system.go @@ -33,6 +33,22 @@ import ( "github.com/siyuan-note/siyuan/kernel/util" ) +func getNetwork(c *gin.Context) { + ret := gulu.Ret.NewResult() + defer c.JSON(http.StatusOK, ret) + + maskedConf, err := model.GetMaskedConf() + if nil != err { + ret.Code = -1 + ret.Msg = "get conf failed: " + err.Error() + return + } + + ret.Data = map[string]interface{}{ + "proxy": maskedConf.System.NetworkProxy, + } +} + func getChangelog(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret)