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

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

Browse source
This commit is contained in:
Vanessa 2023-10-29 17:16:08 +08:00
commit 1741519c43
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/go.mod
View file

@ -47,7 +47,7 @@ require (
github.com/radovskyb/watcher v1.0.7
github.com/sashabaranov/go-openai v1.15.4
github.com/shirou/gopsutil/v3 v3.23.9
github.com/siyuan-note/dejavu v0.0.0-20231028150225-cfb485a4235d
github.com/siyuan-note/dejavu v0.0.0-20231029013956-be65f6fb8afe
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80
github.com/siyuan-note/filelock v0.0.0-20230615140405-d05a21d49524

2
kernel/go.sum
View file

@ -344,6 +344,8 @@ github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05Ut
github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
github.com/siyuan-note/dejavu v0.0.0-20231028150225-cfb485a4235d h1:olisJ1eg3rrAMSM2QXCQKxLVBHRRCn8M0+sld7B9Jgc=
github.com/siyuan-note/dejavu v0.0.0-20231028150225-cfb485a4235d/go.mod h1:sI8koptyofmnE4zcS6/HhOCHmxUcOSvr8ZYF0EqOku4=
github.com/siyuan-note/dejavu v0.0.0-20231029013956-be65f6fb8afe h1:igKhT3NXQVhs4pB7hElii10Fjsd1mYo7qqo+OLNiqaA=
github.com/siyuan-note/dejavu v0.0.0-20231029013956-be65f6fb8afe/go.mod h1:sI8koptyofmnE4zcS6/HhOCHmxUcOSvr8ZYF0EqOku4=
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-20230804030110-cf250f838c80 h1:XghjHKJd+SiL0DkGYFVC+UGUDFtnR4v9gkAbPeh9Eq8=

1
kernel/model/sync.go
View file

@ -770,6 +770,7 @@ var KernelID = gulu.Rand.String(7)
func dialSyncWebSocket() (c *websocket.Conn, err error) {
endpoint := util.GetCloudWebSocketServer() + "/apis/siyuan/dejavu/ws"
header := http.Header{
"User-Agent": []string{util.UserAgent},
"x-siyuan-uid": []string{Conf.User.UserId},
"x-siyuan-kernel": []string{KernelID},
"x-siyuan-ver": []string{util.Ver},