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

🎨 数据同步加入系统时间校验 https://github.com/siyuan-note/siyuan/issues/7669

Browse source
This commit is contained in:
Liang Ding 2023-03-15 11:46:30 +08:00
parent 71eea62578
commit 2dfb5b38e9
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
8 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/go.mod
View file

@ -42,7 +42,7 @@ require (
github.com/radovskyb/watcher v1.0.7
github.com/sashabaranov/go-gpt3 v1.4.0
github.com/shirou/gopsutil/v3 v3.23.2
github.com/siyuan-note/dejavu v0.0.0-20230315030141-aa009a045727
github.com/siyuan-note/dejavu v0.0.0-20230315034343-e9513a7e1999
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b
github.com/siyuan-note/filelock v0.0.0-20230223100551-200cbe1cf84e

6
kernel/go.sum
View file

@ -279,6 +279,12 @@ github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
github.com/siyuan-note/dejavu v0.0.0-20230315030141-aa009a045727 h1:FkwDzml+y1Vr0KBMdO4AU7/t+1grcSq/RA4xub9F6LU=
github.com/siyuan-note/dejavu v0.0.0-20230315030141-aa009a045727/go.mod h1:KUsHkTYpibU30rUArZOakCCHF1SGHQlxPWUu2LqW72s=
github.com/siyuan-note/dejavu v0.0.0-20230315033328-1ba6b15d02ba h1:GJUcrnYvt92w3VIO+8RaiYzDyl9EYucm6XO+i8amxh4=
github.com/siyuan-note/dejavu v0.0.0-20230315033328-1ba6b15d02ba/go.mod h1:KUsHkTYpibU30rUArZOakCCHF1SGHQlxPWUu2LqW72s=
github.com/siyuan-note/dejavu v0.0.0-20230315033551-2d5f5db2919f h1:Aqrf755AR9zGMFYAfLyZ1kIdQi5x2c8YXGxLULNHD6M=
github.com/siyuan-note/dejavu v0.0.0-20230315033551-2d5f5db2919f/go.mod h1:KUsHkTYpibU30rUArZOakCCHF1SGHQlxPWUu2LqW72s=
github.com/siyuan-note/dejavu v0.0.0-20230315034343-e9513a7e1999 h1:t4FSwNVaa2CJbAIJNyF5egCdgqAeBDbP0WmGXcPBbGs=
github.com/siyuan-note/dejavu v0.0.0-20230315034343-e9513a7e1999/go.mod h1:KUsHkTYpibU30rUArZOakCCHF1SGHQlxPWUu2LqW72s=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b h1:828lTUW2C0uNiolODqoACu7J8sDUzswD4Xo04mUombg=

2
kernel/model/sync.go
View file

@ -505,6 +505,8 @@ func formatErrorMsg(err error) string {
msg = Conf.Language(189)
} else if errors.Is(err, dejavu.ErrRepoFatalErr) {
msg = Conf.Language(23)
} else if errors.Is(err, cloud.ErrSystemTimeIncorrect) {
msg = Conf.Language(195)
} else {
msgLowerCase := strings.ToLower(msg)
if strings.Contains(msgLowerCase, "permission denied") || strings.Contains(msg, "access is denied") {