From ad60a2827890ddd9b5c1cbfa0fdf9e1e245e8e7b Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 2 Jan 2023 21:36:44 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=88=86=E4=BA=AB=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=88=B0=E9=93=BE=E6=BB=B4=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/2004?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/export.go | 18 ++++++++++++++++++ kernel/api/router.go | 1 + kernel/model/export.go | 3 +++ 3 files changed, 22 insertions(+) diff --git a/kernel/api/export.go b/kernel/api/export.go index 73c0d1e64..8b6a5b283 100644 --- a/kernel/api/export.go +++ b/kernel/api/export.go @@ -31,6 +31,24 @@ import ( "github.com/siyuan-note/siyuan/kernel/util" ) +func export2Liandi(c *gin.Context) { + ret := gulu.Ret.NewResult() + defer c.JSON(http.StatusOK, ret) + + arg, ok := util.JsonArg(c, ret) + if !ok { + return + } + + id := arg["id"].(string) + err := model.Export2Liandi(id) + if nil != err { + ret.Code = -1 + ret.Msg = err.Error() + return + } +} + func exportDataInFolder(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) diff --git a/kernel/api/router.go b/kernel/api/router.go index cb3bf3d5d..f1052b81a 100644 --- a/kernel/api/router.go +++ b/kernel/api/router.go @@ -236,6 +236,7 @@ func ServeAPI(ginServer *gin.Engine) { ginServer.Handle("POST", "/api/export/exportData", model.CheckAuth, exportData) ginServer.Handle("POST", "/api/export/exportDataInFolder", model.CheckAuth, exportDataInFolder) ginServer.Handle("POST", "/api/export/exportTempContent", model.CheckAuth, exportTempContent) + ginServer.Handle("POST", "/api/export/export2Liandi", model.CheckAuth, export2Liandi) ginServer.Handle("POST", "/api/import/importStdMd", model.CheckAuth, model.CheckReadonly, importStdMd) ginServer.Handle("POST", "/api/import/importData", model.CheckAuth, model.CheckReadonly, importData) diff --git a/kernel/model/export.go b/kernel/model/export.go index 2ab934275..87432d777 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -58,6 +58,9 @@ func Export2Liandi(id string) (err error) { return } + sqlAssets := sql.QueryRootBlockAssets(id) + err = uploadCloud(sqlAssets) + // 判断帖子是否已经存在,存在则使用更新接口 foundArticle := false articleId := tree.Root.IALAttr("liandiArticleId")