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

kernel/model/conf.go

@@ -656,6 +656,13 @@ func (conf *AppConf) GetClosedBoxes() (ret []*Box) {
 }
 
 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]
 	if "" != ret {
 		return

kernel/model/sync.go

@@ -695,6 +695,10 @@ func connectSyncWebSocket() {
 				reconnected := false
 				for retries := 0; retries < 7; retries++ {
 					time.Sleep(7 * time.Second)
+					if nil == Conf.User {
+						return
+					}
+
 					//logging.LogInfof("reconnecting sync websocket...")
 					webSocketConn, dialErr = dialSyncWebSocket()
 					if nil != dialErr {
@@ -743,7 +747,6 @@ func connectSyncWebSocket() {
 var KernelID = gulu.Rand.String(7)
 
 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"
 	header := http.Header{
 		"x-siyuan-uid":      []string{Conf.User.UserId},