From 77d369e26f09465dda58e597a3e0e3a5a054406a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 6 Jan 2023 11:06:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8C=E6=97=B6=E6=89=93=E5=BC=80=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/4567?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/electron/main.js | 2 +- kernel/server/serve.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/electron/main.js b/app/electron/main.js index 7ee99e4fd..4763e7c25 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -900,6 +900,7 @@ powerMonitor.on('suspend', () => { }) powerMonitor.on('resume', async () => { + // 桌面端系统休眠唤醒后判断网络连通性后再执行数据同步 https://github.com/siyuan-note/siyuan/issues/6687 writeLog('system resume') const isOnline = async () => { try { @@ -931,7 +932,6 @@ powerMonitor.on('resume', async () => { } writeLog('sync after system resume') - // 桌面端系统休眠唤醒后同步延时 7s 后再执行 https://github.com/siyuan-note/siyuan/issues/6687 fetch(getServer() + '/api/sync/performSync', {method: 'POST'}) }) diff --git a/kernel/server/serve.go b/kernel/server/serve.go index 1577b2f68..90d9858b4 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -108,7 +108,7 @@ func Serve(fastMode bool) { rewritePortJSON(pid, port) } - logging.LogInfof("kernel [pid=%s] is booting [%s]", pid, "http://"+util.LocalHost+":"+port) + logging.LogInfof("kernel [pid=%s] http server is booting [%s]", pid, "http://"+util.LocalHost+":"+port) util.HttpServing = true go func() { From 198c6dc4008dbf0e48662ad0f1f039c89a74be6e Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 6 Jan 2023 11:19:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8C=E6=97=B6=E6=89=93=E5=BC=80=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/4567?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/server/serve.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/server/serve.go b/kernel/server/serve.go index 90d9858b4..c76454d8e 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -112,12 +112,13 @@ func Serve(fastMode bool) { util.HttpServing = true go func() { + time.Sleep(1 * time.Second) if util.FixedPort != port { // 启动一个 6806 端口的反向代理服务器，这样浏览器扩展才能直接使用 127.0.0.1:6806，不用配置端口 - serverURL, _ := url.Parse("http://" + host + ":" + port) + serverURL, _ := url.Parse("http://127.0.0.1:" + port) proxy := httputil.NewSingleHostReverseProxy(serverURL) - logging.LogInfof("reverse proxy server [%s] is booting", util.FixedPort) - if proxyErr := http.ListenAndServe(host+":"+util.FixedPort, proxy); nil != proxyErr { + logging.LogInfof("reverse proxy server is booting [%s]", "http://127.0.0.1:"+util.FixedPort) + if proxyErr := http.ListenAndServe("127.0.0.1:"+util.FixedPort, proxy); nil != proxyErr { logging.LogWarnf("boot reverse proxy server [%s] failed: %s", serverURL, proxyErr) } // 反代服务器启动失败不影响核心服务器启动