github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 18:41:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-06-21 16:01:51 +08:00
commit 1781a59cdd
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/model/conf.go
View File

@ -656,6 +656,13 @@ func (conf *AppConf) GetClosedBoxes() (ret []*Box) {
} }
func (conf *AppConf) Language(num int) (ret string) { func (conf *AppConf) Language(num int) (ret string) {
ret = conf.language(num)
subscribeURL := util.GetCloudAccountServer() + "/subscribe/siyuan"
ret = strings.ReplaceAll(ret, "${url}", subscribeURL)
return
}
func (conf *AppConf) language(num int) (ret string) {
ret = util.Langs[conf.Lang][num] ret = util.Langs[conf.Lang][num]
if "" != ret { if "" != ret {
return return

5
kernel/model/sync.go
View File

@ -695,6 +695,10 @@ func connectSyncWebSocket() {
reconnected := false reconnected := false
for retries := 0; retries < 7; retries++ { for retries := 0; retries < 7; retries++ {
time.Sleep(7 * time.Second) time.Sleep(7 * time.Second)
if nil == Conf.User {
return
}
//logging.LogInfof("reconnecting sync websocket...") //logging.LogInfof("reconnecting sync websocket...")
webSocketConn, dialErr = dialSyncWebSocket() webSocketConn, dialErr = dialSyncWebSocket()
if nil != dialErr { if nil != dialErr {
@ -743,7 +747,6 @@ func connectSyncWebSocket() {
var KernelID = gulu.Rand.String(7) var KernelID = gulu.Rand.String(7)
func dialSyncWebSocket() (c *websocket.Conn, err error) { func dialSyncWebSocket() (c *websocket.Conn, err error) {
//endpoint := "ws://127.0.0.1:64388" + "/apis/siyuan/dejavu/ws"
endpoint := util.GetCloudWebSocketServer() + "/apis/siyuan/dejavu/ws" endpoint := util.GetCloudWebSocketServer() + "/apis/siyuan/dejavu/ws"
header := http.Header{ header := http.Header{
"x-siyuan-uid": []string{Conf.User.UserId}, "x-siyuan-uid": []string{Conf.User.UserId},