瀏覽代碼

:memo: Update FAQ

Liang Ding 2 年之前
父節點
當前提交
15bf394ba3
共有 2 個文件被更改,包括 21 次插入7 次删除
  1. 20 6
      kernel/model/assets.go
  2. 1 1
      kernel/model/export.go

+ 20 - 6
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)

+ 1 - 1
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
 	}