Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-18 04:58:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-01-06 11:38:03 +08:00
commit 0c19a059c9
2 changed files with 6 additions and 5 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 () => {
// 桌面端系统休眠唤醒后判断网络连通性后再执行数据同步 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'})
})