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

app/electron-builder-darwin-arm64.yml

@@ -67,3 +67,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"

app/electron-builder-darwin.yml

@@ -67,3 +67,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"

app/electron-builder-linux-arm64.yml

@@ -71,3 +71,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"

app/electron-builder-linux.yml

@@ -68,3 +68,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"

app/electron-builder.yml

@@ -74,3 +74,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"

kernel/api/export.go

@@ -513,7 +513,7 @@ func exportDocx(c *gin.Context) {
 
 	fullPath, err := model.ExportDocx(id, savePath, removeAssets, merge)
 	if err != nil {
-		ret.Code = -1
+		ret.Code = 1
 		ret.Msg = err.Error()
 		ret.Data = map[string]interface{}{"closeTimeout": 7000}
 		return

kernel/model/conf.go

@@ -1272,9 +1272,9 @@ func subscribeConfEvents() {
 			params += " \"" + util.PandocTemplatePath + "\""
 			Conf.Export.PandocParams = strings.TrimSpace(params)
 		}
-		
+
 		logging.LogInfof("pandoc params set to [%s]", Conf.Export.PandocParams)
-		logging.LogInfof("pandoc template [%s], color filter [%s]", util.PandocTemplatePath, util.PandocColorFilterPath)
+		logging.LogInfof("pandoc resources [%s, %s]", util.PandocTemplatePath, util.PandocColorFilterPath)
 		Conf.Save()
 	})
 }