fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

上传完善

Browse Source
This commit is contained in:
Hiven 2023-08-02 11:30:27 +08:00
parent d75bc8f2be
commit 3388b446fd
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/upload/internal/logic/uploadfilesbackendlogic.go
View File

@ -144,17 +144,20 @@ func (l *UploadFilesBackendLogic) UploadFilesBackend(req *types.UploadFilesReq,
} }
} }
}, func(item interface{}, writer mr.Writer[interface{}], cancel func(error)) { }, func(item interface{}, writer mr.Writer[interface{}], cancel func(error)) {
var uploadUrl = UploadUrl{}
uploadDataInfo := item.(UploadData) uploadDataInfo := item.(UploadData)
var uploadUrl = UploadUrl{}
uploadUrl.Key = uploadDataInfo.FileKey
uploadUrl.ApiType = uploadDataInfo.ApiType
uploadUrl.ResourceType = uploadDataInfo.FileType
var resourceId string = uploadDataInfo.HashKey var resourceId string = uploadDataInfo.HashKey
// 查询数据库 // 查询数据库
resourceInfo, err := resourceModel.FindOneById(l.ctx, resourceId) resourceInfo, err := resourceModel.FindOneById(l.ctx, resourceId)
if err == nil && resourceInfo.ResourceId != "" { if err == nil && resourceInfo.ResourceId != "" {
uploadUrl.Status = 1 uploadUrl.Status = 1
uploadUrl.ResourceId = resourceId uploadUrl.ResourceId = resourceId
uploadUrl.Url = *resourceInfo.ResourceUrl uploadUrl.ResourceUrl = *resourceInfo.ResourceUrl
uploadUrl.Key = uploadDataInfo.FileKey
} else { } else {
// 创建S3对象存储请求 // 创建S3对象存储请求
s3req, _ = svc.PutObjectRequest( s3req, _ = svc.PutObjectRequest(
@ -169,21 +172,17 @@ func (l *UploadFilesBackendLogic) UploadFilesBackend(req *types.UploadFilesReq,
// 发送请求 // 发送请求
err = s3req.Send() err = s3req.Send()
// 检查是否有错误 // 检查是否有错误
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
uploadUrl.Status = 0 uploadUrl.Status = 0
uploadUrl.Url = ""
uploadUrl.Key = uploadDataInfo.FileKey
} else { } else {
var url = s3req.HTTPRequest.URL.String() var url = s3req.HTTPRequest.URL.String()
// 打印请求URL // 打印请求URL
logx.Info(url) logx.Info(url)
uploadUrl.Status = 1 uploadUrl.Status = 1
uploadUrl.Url = url
uploadUrl.Key = uploadDataInfo.FileKey
uploadUrl.ResourceId = resourceId uploadUrl.ResourceId = resourceId
uploadUrl.ResourceUrl = url
var version string = "0.0.1" var version string = "0.0.1"
var nowTime = time.Now() var nowTime = time.Now()
_, err = resourceModel.CreateOrUpdate(l.ctx, &gmodel.FsResource{ _, err = resourceModel.CreateOrUpdate(l.ctx, &gmodel.FsResource{
@ -251,9 +250,10 @@ type UploadData struct {
} }
type UploadUrl struct { type UploadUrl struct {
Status int64 `json:"status"` Key string `json:"key"`
ResourceId string `json:"resource_id"` Status int64 `json:"status"`
Url string `json:"url"` ApiType int64 `json:"api_type"`
Key string `json:"key"` ResourceId string `json:"resource_id"`
Metadata string `json:"metadata"` ResourceType string `json:"resource_type"`
ResourceUrl string `json:"resource_url"`
} }

12
server/upload/internal/logic/uploadfilesfrontendlogic.go
View File

@ -108,9 +108,13 @@ func (l *UploadFilesFrontendLogic) UploadFilesFrontend(req *types.UploadFilesReq
} }
} }
}, func(item interface{}, writer mr.Writer[interface{}], cancel func(error)) { }, func(item interface{}, writer mr.Writer[interface{}], cancel func(error)) {
var uploadUrl = UploadUrl{}
uploadDataInfo := item.(UploadData) uploadDataInfo := item.(UploadData)
var uploadUrl = UploadUrl{}
uploadUrl.Key = uploadDataInfo.FileKey
uploadUrl.ApiType = uploadDataInfo.ApiType
uploadUrl.ResourceType = uploadDataInfo.FileType
s3req, _ := svc.PutObjectRequest( s3req, _ := svc.PutObjectRequest(
&s3.PutObjectInput{ &s3.PutObjectInput{
Bucket: uploadDataInfo.Bucket, Bucket: uploadDataInfo.Bucket,
@ -123,16 +127,12 @@ func (l *UploadFilesFrontendLogic) UploadFilesFrontend(req *types.UploadFilesReq
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
uploadUrl.Status = 0 uploadUrl.Status = 0
uploadUrl.Url = ""
uploadUrl.ResourceId = uploadDataInfo.HashKey
uploadUrl.Key = uploadDataInfo.FileKey
} else { } else {
// 打印请求URL // 打印请求URL
logx.Info(url) logx.Info(url)
uploadUrl.Status = 1 uploadUrl.Status = 1
uploadUrl.Url = url uploadUrl.ResourceUrl = url
uploadUrl.ResourceId = uploadDataInfo.HashKey uploadUrl.ResourceId = uploadDataInfo.HashKey
uploadUrl.Key = uploadDataInfo.FileKey
} }
// Notice 这个必须加! // Notice 这个必须加!
writer.Write(uploadUrl) writer.Write(uploadUrl)

10
server/upload/internal/types/types.go
View File

@ -18,11 +18,11 @@ type UploadFilesReq struct {
} }
type UploadCallbackReq struct { type UploadCallbackReq struct {
FileType string `form:"file_type"` // 文件类型 / fbx / hdr ResourceId string `form:"resource_id"` // 资源ID
UploadKey string `form:"upload_key"` // 上传KEY ResourceType string `form:"resource_type"` // 资源类型
UploadBucket string `form:"upload_bucket"` // 上传桶名 ResourceUrl string `form:"resource_url"` // 资源URL
Version string `form:"version,optional"` // 版本信息 Metadata string `form:"metadata,optional"` // 元数据,json格式,存储图像分率
Metadata string `form:"metadata,optional"` // 元数据,json格式,存储图像分率 ApiType int64 `form:"api_type,options=[1,2],default=1"` // 调用类型：1=对外，2=对内
} }
type RequestUpFile struct { type RequestUpFile struct {

10
server_api/upload.api
View File

@ -48,11 +48,11 @@ type (
UploadInfo string `form:"upload_info"` // 上传信息 json UploadInfo string `form:"upload_info"` // 上传信息 json
} }
UploadCallbackReq { UploadCallbackReq {
FileType string `form:"file_type"` // 文件类型 / fbx / hdr ResourceId string `form:"resource_id"` // 资源ID
UploadKey string `form:"upload_key"` // 上传KEY ResourceType string `form:"resource_type"` // 资源类型
UploadBucket string `form:"upload_bucket"` // 上传桶名 ResourceUrl string `form:"resource_url"` // 资源URL
Version string `form:"version,optional"` // 版本信息 Metadata string `form:"metadata,optional"` // 元数据,json格式,存储图像分率
Metadata string `form:"metadata,optional"` // 元数据,json格式,存储图像分率 ApiType int64 `form:"api_type,options=[1,2],default=1"` // 调用类型：1=对外，2=对内
} }
) )