diff --git a/app/electron-builder-darwin-arm64.yml b/app/electron-builder-darwin-arm64.yml index f1fc7295c..43ef17b64 100644 --- a/app/electron-builder-darwin-arm64.yml +++ b/app/electron-builder-darwin-arm64.yml @@ -67,3 +67,4 @@ extraResources: to: "pandoc.zip" - from: "pandoc/pandoc-resources" to: "pandoc-resources" + filter: "!**/{.DS_Store}" diff --git a/app/electron-builder-darwin.yml b/app/electron-builder-darwin.yml index 55cdc229e..ad89038b9 100644 --- a/app/electron-builder-darwin.yml +++ b/app/electron-builder-darwin.yml @@ -67,3 +67,4 @@ extraResources: to: "pandoc.zip" - from: "pandoc/pandoc-resources" to: "pandoc-resources" + filter: "!**/{.DS_Store}" diff --git a/app/electron-builder-linux-arm64.yml b/app/electron-builder-linux-arm64.yml index 3fbc65b23..132f59ff7 100644 --- a/app/electron-builder-linux-arm64.yml +++ b/app/electron-builder-linux-arm64.yml @@ -71,3 +71,4 @@ extraResources: to: "pandoc.zip" - from: "pandoc/pandoc-resources" to: "pandoc-resources" + filter: "!**/{.DS_Store}" diff --git a/app/electron-builder-linux.yml b/app/electron-builder-linux.yml index b06a4dd11..4db771432 100644 --- a/app/electron-builder-linux.yml +++ b/app/electron-builder-linux.yml @@ -68,3 +68,4 @@ extraResources: to: "pandoc.zip" - from: "pandoc/pandoc-resources" to: "pandoc-resources" + filter: "!**/{.DS_Store}" diff --git a/app/electron-builder.yml b/app/electron-builder.yml index 484ae6be2..23f02784e 100644 --- a/app/electron-builder.yml +++ b/app/electron-builder.yml @@ -74,3 +74,4 @@ extraResources: to: "pandoc.zip" - from: "pandoc/pandoc-resources" to: "pandoc-resources" + filter: "!**/{.DS_Store}" diff --git a/kernel/api/export.go b/kernel/api/export.go index c62cba92f..3f9d920fe 100644 --- a/kernel/api/export.go +++ b/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 diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 0493e333e..8eb1a9bb2 100644 --- a/kernel/model/conf.go +++ b/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() }) }