diff --git a/app/stage/auth.html b/app/stage/auth.html index d38c9d038..e0377182c 100644 --- a/app/stage/auth.html +++ b/app/stage/auth.html @@ -581,9 +581,9 @@ }) // 用于授权页保持连接,避免非常驻内存内核自动退出 https://github.com/siyuan-note/insider/issues/1099 - const ws = new WebSocket((window.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws?app=siyuan&id=auth') + const ws = new WebSocket((window.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws?app=siyuan' + Math.random().toString(36).substring(8) + '&id=auth&type=auth') ws.onmessage = (event) => { - const data = processMessage(JSON.parse(event.data)); + const data = JSON.parse(event.data); if (data.cmd === "loginAuth") { window.location.href = toPath } diff --git a/kernel/model/session.go b/kernel/model/session.go index 93e3d7977..39b4c2c25 100644 --- a/kernel/model/session.go +++ b/kernel/model/session.go @@ -153,7 +153,7 @@ func LoginAuth(c *gin.Context) { return } - util.BroadcastByType("main", "loginAuth", 0, "", nil) + util.BroadcastByType("auth", "loginAuth", 0, "", nil) } func GetCaptcha(c *gin.Context) { diff --git a/kernel/server/serve.go b/kernel/server/serve.go index 10d174f78..aabf6f1f8 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -727,7 +727,7 @@ func serveWebSocket(ginServer *gin.Engine) { if !authOk { // 用于授权页保持连接,避免非常驻内存内核自动退出 https://github.com/siyuan-note/insider/issues/1099 - authOk = strings.Contains(s.Request.RequestURI, "/ws?app=siyuan&id=auth") + authOk = strings.Contains(s.Request.RequestURI, "/ws?app=siyuan") && strings.Contains(s.Request.RequestURI, "&id=auth&type=auth") } if !authOk {