From f316c44d351f2b5658cf504d00cf39dc698ef0ea Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 6 Jan 2023 16:44:54 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E5=A4=9A=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/main.js        | 11 +++++++----
 app/src/util/onGetConfig.ts |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/electron/main.js b/app/electron/main.js
index 4763e7c25..cf840b8e1 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -58,8 +58,8 @@ try {
   app.exit()
 }
 
-const getServer = () => {
-  return 'http://127.0.0.1:' + kernelPort
+const getServer = (port = kernelPort) => {
+  return 'http://127.0.0.1:' + port
 }
 
 const sleep = (ms) => {
@@ -338,7 +338,8 @@ const boot = () => {
   Menu.setApplicationMenu(menu)
   // 当前页面链接使用浏览器打开
   currentWindow.webContents.on('will-navigate', (event, url) => {
-    if (url.startsWith(getServer())) {
+    const currentURL = new URL(event.sender.getURL())
+    if (url.startsWith(getServer(currentURL.port))) {
       return
     }
 
@@ -750,7 +751,7 @@ app.whenReady().then(() => {
         return true
       }
     })
-    await fetch(getServer() + '/api/system/uiproc?pid=' + process.pid,
+    await fetch(getServer(data.port) + '/api/system/uiproc?pid=' + process.pid,
       {method: 'POST'})
   })
   ipcMain.on('siyuan-hotkey', (event, data) => {
@@ -932,10 +933,12 @@ powerMonitor.on('resume', async () => {
   }
 
   writeLog('sync after system resume')
+  // TODO
   fetch(getServer() + '/api/sync/performSync', {method: 'POST'})
 })
 
 powerMonitor.on('shutdown', () => {
   writeLog('system shutdown')
+  // TODO
   fetch(getServer() + '/api/system/exit', {method: 'POST'})
 })
diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts
index 9737388e1..550216847 100644
--- a/app/src/util/onGetConfig.ts
+++ b/app/src/util/onGetConfig.ts
@@ -139,6 +139,7 @@ export const onGetConfig = (isStart: boolean) => {
         languages: window.siyuan.languages["_trayMenu"],
         workspaceDir: window.siyuan.config.system.workspaceDir,
         id: getCurrentWindow().id,
+        port: location.port
     });
     ipcRenderer.send(Constants.SIYUAN_HOTKEY, {
         languages: window.siyuan.languages["_trayMenu"],