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

app/stage/auth.html

@@ -539,7 +539,7 @@
 
         await ipcRenderer.invoke("siyuan-init", {
             languages: {{.trayMenuLangs}},
-            workspaceDir: '/Users/Vanessa/Work/SiYuan',
+            workspaceDir: '{{.workspaceDir}}',
             port: location.port
         });
         ipcRenderer.send("siyuan-hotkey", {

kernel/server/serve.go

@@ -351,6 +351,7 @@ func serveCheckAuth(c *gin.Context) {
 		"workspacePath":          util.WorkspaceDir,
 		"keymapGeneralToggleWin": keymapHideWindow,
 		"trayMenuLangs":          util.TrayMenuLangs[util.Lang],
+		"workspaceDir":           util.WorkspaceDir,
 	}
 	buf := &bytes.Buffer{}
 	if err = tpl.Execute(buf, model); nil != err {