Merge branch 'feat-hjj-filebrowser#Saas3' into dev
This commit is contained in:
commit
469fac745d
@ -103,6 +103,24 @@ const (
|
||||
BalanceMetricsExportFailed = "服务使用明细数据导出失败"
|
||||
)
|
||||
|
||||
//素材库
|
||||
const (
|
||||
FileListFailed = "素材库列表查询失败"
|
||||
FileUsageFailed = "素材库使用情况查询失败"
|
||||
GetFileInfoFailed = "素材库文件信息查询失败"
|
||||
CreateFileFailed = "素材库文件创建失败"
|
||||
DeleteFileFailed = "素材库文件删除失败"
|
||||
SearchFileFailed = "素材库文件搜索失败"
|
||||
UploadFileFailed = "素材库文件上传失败"
|
||||
TusCreateFailed = "素材库文件创建失败"
|
||||
TusUploadFailed = "素材库文件上传失败"
|
||||
PreviewFileFailed = "素材库文件预览失败"
|
||||
ActionFailed = "素材库文件操作失败"
|
||||
DirDownloadFailed = "素材库文件下载失败"
|
||||
InvalidUploadOffset = "无效的上传偏移量"
|
||||
ERROR_OPEN_FILE = "打开文件错误"
|
||||
)
|
||||
|
||||
//官网
|
||||
const (
|
||||
CreateSecFilingFailed = "创建官方信息失败"
|
||||
|
||||
@ -3,9 +3,9 @@ package file
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"fonchain-fiee/api/files"
|
||||
"fonchain-fiee/pkg/service"
|
||||
"fonchain-fiee/pkg/service/bundle/common"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
@ -24,7 +24,7 @@ func Raw(ctx *gin.Context) {
|
||||
w.Header().Set("Cache-Control", "private")
|
||||
rs, err := newGrpcReaderSeeker(getUserSpacePath(ctx), ctx.Param("path"))
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.FileListFailed))
|
||||
return
|
||||
}
|
||||
if r.URL.Query().Get("inline") == "true" {
|
||||
@ -53,7 +53,7 @@ func List(ctx *gin.Context) {
|
||||
PageSize: int32(pageSize),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.FileListFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -66,7 +66,7 @@ func Usage(ctx *gin.Context) {
|
||||
UserSpacePath: getUserSpacePath(ctx),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.FileUsageFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -78,7 +78,7 @@ func Info(ctx *gin.Context) {
|
||||
UserSpacePath: getUserSpacePath(ctx),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.GetFileInfoFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -93,7 +93,7 @@ func Create(ctx *gin.Context) {
|
||||
req.UserSpacePath = getUserSpacePath(ctx)
|
||||
resp, err := service.FilesProvider.Create(ctx, &req)
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.CreateFileFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -105,7 +105,7 @@ func Delete(ctx *gin.Context) {
|
||||
UserSpacePath: getUserSpacePath(ctx),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.DeleteFileFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -118,7 +118,7 @@ func Search(ctx *gin.Context) {
|
||||
Query: ctx.Query("query"),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.SearchFileFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -132,7 +132,7 @@ func Upload(ctx *gin.Context) {
|
||||
}
|
||||
b, err := io.ReadAll(ctx.Request.Body)
|
||||
if !ok {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.ERROR_OPEN_FILE))
|
||||
return
|
||||
}
|
||||
resp, err := service.FilesProvider.Upload(ctx, &files.UploadReq{
|
||||
@ -141,7 +141,7 @@ func Upload(ctx *gin.Context) {
|
||||
Content: b,
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.UploadFileFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -156,7 +156,7 @@ func TusCreate(ctx *gin.Context) {
|
||||
req.UserSpacePath = getUserSpacePath(ctx)
|
||||
resp, err := service.FilesProvider.TusCreate(ctx, &req)
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.TusCreateFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -170,24 +170,24 @@ func TusUpload(ctx *gin.Context) {
|
||||
}
|
||||
uploadOffset, err := getUploadOffset(ctx.Request)
|
||||
if err != nil {
|
||||
service.Error(ctx, fmt.Errorf("invalid upload offset: %w", err))
|
||||
service.Error(ctx, errors.New(common.ERROR_OPEN_FILE))
|
||||
return
|
||||
}
|
||||
mf, err := ctx.MultipartForm()
|
||||
if err != nil {
|
||||
service.Error(ctx, fmt.Errorf("invalid upload offset: %w", err))
|
||||
service.Error(ctx, errors.New(common.ERROR_OPEN_FILE))
|
||||
return
|
||||
}
|
||||
f, err := mf.File["file"][0].Open()
|
||||
if err != nil {
|
||||
service.Error(ctx, fmt.Errorf("invalid upload offset: %w", err))
|
||||
service.Error(ctx, errors.New(common.ERROR_OPEN_FILE))
|
||||
return
|
||||
}
|
||||
defer f.Close()
|
||||
b, err := io.ReadAll(f)
|
||||
// b, err := io.ReadAll(ctx.Request.Body)
|
||||
if !ok {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.ERROR_OPEN_FILE))
|
||||
return
|
||||
}
|
||||
resp, err := service.FilesProvider.TusUpload(ctx, &files.TusUploadReq{
|
||||
@ -197,7 +197,7 @@ func TusUpload(ctx *gin.Context) {
|
||||
UserSpacePath: getUserSpacePath(ctx),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.TusUploadFailed))
|
||||
return
|
||||
}
|
||||
ctx.Writer.Header().Set("Upload-Offset", strconv.FormatInt(resp.UploadOffset, 10))
|
||||
@ -216,7 +216,7 @@ func Preview(ctx *gin.Context) {
|
||||
Size: uint32(size),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.PreviewFileFailed))
|
||||
return
|
||||
}
|
||||
ctx.Writer.Header().Set("Cache-Control", "private")
|
||||
@ -232,7 +232,7 @@ func Action(ctx *gin.Context) {
|
||||
req.UserSpacePath = getUserSpacePath(ctx)
|
||||
resp, err := service.FilesProvider.Action(ctx, &req)
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.ActionFailed))
|
||||
return
|
||||
}
|
||||
service.Success(ctx, resp)
|
||||
@ -249,12 +249,12 @@ func DirDownload(ctx *gin.Context) {
|
||||
UserSpacePath: getUserSpacePath(ctx),
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.DirDownloadFailed))
|
||||
return
|
||||
}
|
||||
header, err := stream.Header()
|
||||
if err != nil {
|
||||
service.Error(ctx, err)
|
||||
service.Error(ctx, errors.New(common.DirDownloadFailed))
|
||||
return
|
||||
}
|
||||
|
||||
@ -271,7 +271,7 @@ func DirDownload(ctx *gin.Context) {
|
||||
func getUploadOffset(r *http.Request) (int64, error) {
|
||||
uploadOffset, err := strconv.ParseInt(r.Header.Get("Upload-Offset"), 10, 64)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("invalid upload offset: %w", err)
|
||||
return 0, errors.New(common.InvalidUploadOffset)
|
||||
}
|
||||
return uploadOffset, nil
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user