diff --git a/kernel/model/assets.go b/kernel/model/assets.go index 95e5ed218..78914d245 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -281,16 +281,17 @@ func UploadAssets2Cloud(rootID string) (err error) { } sqlAssets := sql.QueryRootBlockAssets(rootID) - err = uploadAssets2Cloud(sqlAssets, "5") + err = uploadAssets2Cloud(sqlAssets, bizTypeUploadAssets) return } +const ( + bizTypeUploadAssets = "upload-assets" + bizTypeExport2Liandi = "export-liandi" +) + // uploadAssets2Cloud 将资源文件上传到云端图床。 -// metaType 为服务端 Filemeta.FILEMETA_TYPE,这里只有两个值: -// -// 5: SiYuan,表示为 SiYuan 上传图床 -// 4: Client,表示作为客户端分享发布帖子时上传的文件 -func uploadAssets2Cloud(sqlAssets []*sql.Asset, metaType string) (err error) { +func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) { syncedAssets := readWorkspaceAssets() var unSyncAssets []string for _, sqlAsset := range sqlAssets { @@ -337,6 +338,18 @@ func uploadAssets2Cloud(sqlAssets []*sql.Asset, metaType string) (err error) { if IsSubscriber() { limitSize = 10 * 1024 * 1024 // 10MB } + + // metaType 为服务端 Filemeta.FILEMETA_TYPE,这里只有两个值: + // + // 5: SiYuan,表示为 SiYuan 上传图床 + // 4: Client,表示作为客户端分享发布帖子时上传的文件 + var metaType = "5" + if bizTypeUploadAssets == bizType { + metaType = "5" + } else if bizTypeExport2Liandi == bizType { + metaType = "4" + } + var completedUploadAssets []string for _, absAsset := range uploadAbsAssets { fi, statErr := os.Stat(absAsset) @@ -361,6 +374,7 @@ func uploadAssets2Cloud(sqlAssets []*sql.Asset, metaType string) (err error) { SetFile("file[]", absAsset). SetCookies(&http.Cookie{Name: "symphony", Value: uploadToken}). SetHeader("meta-type", metaType). + SetHeader("biz-type", bizType). Post(util.AliyunServer + "/apis/siyuan/upload?ver=" + util.Ver) if nil != reqErr { logging.LogErrorf("upload assets failed: %s", reqErr) diff --git a/kernel/model/export.go b/kernel/model/export.go index 983f4c887..2a55d2904 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -59,7 +59,7 @@ func Export2Liandi(id string) (err error) { } sqlAssets := sql.QueryRootBlockAssets(id) - err = uploadAssets2Cloud(sqlAssets, "4") + err = uploadAssets2Cloud(sqlAssets, bizTypeExport2Liandi) if nil != err { return }