Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 桌面端支持同时打开多个工作空间 https://github.com/siyuan-note/siyuan/issues/4567

Browse source
This commit is contained in:
Liang Ding 2023-01-06 11:06:47 +08:00
parent 5c60719c4c
commit 77d369e26f
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/electron/main.js
View file

@ -900,6 +900,7 @@ powerMonitor.on('suspend', () => {
}) })
powerMonitor.on('resume', async () => { powerMonitor.on('resume', async () => {
// 桌面端系统休眠唤醒后判断网络连通性后再执行数据同步 https://github.com/siyuan-note/siyuan/issues/6687
writeLog('system resume') writeLog('system resume')
const isOnline = async () => { const isOnline = async () => {
try { try {
@ -931,7 +932,6 @@ powerMonitor.on('resume', async () => {
} }
writeLog('sync after system resume') writeLog('sync after system resume')
// 桌面端系统休眠唤醒后同步延时 7s 后再执行 https://github.com/siyuan-note/siyuan/issues/6687
fetch(getServer() + '/api/sync/performSync', {method: 'POST'}) fetch(getServer() + '/api/sync/performSync', {method: 'POST'})
}) })

2
kernel/server/serve.go
View file

@ -108,7 +108,7 @@ func Serve(fastMode bool) {
rewritePortJSON(pid, port) 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 util.HttpServing = true
go func() { go func() {