Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

📝 Update FAQ

Browse source
This commit is contained in:
Liang Ding 2023-01-04 13:50:18 +08:00
parent fcb1bf3d98
commit 15bf394ba3
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kernel/model/assets.go
View file

@ -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)

2
kernel/model/export.go
View file

@ -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
}