diff --git a/server/upload/internal/logic/uploadcallbacklogic.go b/server/upload/internal/logic/uploadcallbacklogic.go index 615052fd..796016ba 100644 --- a/server/upload/internal/logic/uploadcallbacklogic.go +++ b/server/upload/internal/logic/uploadcallbacklogic.go @@ -83,8 +83,10 @@ func (l *UploadCallbackLogic) UploadCallback(req *types.UploadCallbackReq, useri fsResource.ResourceUrl = &req.ResourceUrl fsResource.Metadata = &req.Metadata fsResource.ApiType = &req.ApiType + fsResource.Source = &req.Source fsResource.BucketName = bucketName fsResource.Version = &version + if resourceInfo.ResourceId == "" { _, err = resourceModelTS.BuilderCreate(ctx, transBuilder, fsResource) } else { diff --git a/server/upload/internal/logic/uploadfilebackendlogic.go b/server/upload/internal/logic/uploadfilebackendlogic.go index 3864c3a4..8e817639 100644 --- a/server/upload/internal/logic/uploadfilebackendlogic.go +++ b/server/upload/internal/logic/uploadfilebackendlogic.go @@ -90,6 +90,7 @@ func (l *UploadFileBackendLogic) UploadFileBackend(req *types.UploadFileBackendR ApiType: req.ApiType, UserId: userId, GuestId: guestId, + Source: req.Source, }) if err != nil { diff --git a/server/upload/internal/logic/uploadfilebaselogic.go b/server/upload/internal/logic/uploadfilebaselogic.go index 0e079884..55326ac1 100644 --- a/server/upload/internal/logic/uploadfilebaselogic.go +++ b/server/upload/internal/logic/uploadfilebaselogic.go @@ -77,6 +77,7 @@ func (l *UploadFileBaseLogic) UploadFileBase(req *types.UploadFileBaseReq, useri ApiType: req.ApiType, UserId: userId, GuestId: guestId, + Source: req.Source, }) if err != nil { diff --git a/server/upload/internal/logic/uploadfilesbackendlogic.go b/server/upload/internal/logic/uploadfilesbackendlogic.go index 6995b0c7..cedbb8de 100644 --- a/server/upload/internal/logic/uploadfilesbackendlogic.go +++ b/server/upload/internal/logic/uploadfilesbackendlogic.go @@ -123,6 +123,7 @@ func (l *UploadFilesBackendLogic) UploadFilesBackend(req *types.UploadFilesReq, ApiType: req.ApiType, Bucket: bucketName, HashKey: hashKey, + Source: req.Source, } } }, func(item interface{}, writer mr.Writer[interface{}], cancel func(error)) { @@ -148,6 +149,7 @@ func (l *UploadFilesBackendLogic) UploadFilesBackend(req *types.UploadFilesReq, ApiType: req.ApiType, UserId: userId, GuestId: guestId, + Source: uploadDataInfo.Source, }) if err == nil { uploadUrl.Status = 1 @@ -201,6 +203,7 @@ type UploadData struct { Bucket *string `json:"bucket"` HashKey string `json:"hash_key"` FileData []byte `fsfile:"data"` + Source string `json:"source"` } type UploadUrl struct { diff --git a/server/upload/internal/logic/uploadlogologic.go b/server/upload/internal/logic/uploadlogologic.go index 1c51eb22..074c3d3f 100644 --- a/server/upload/internal/logic/uploadlogologic.go +++ b/server/upload/internal/logic/uploadlogologic.go @@ -115,6 +115,7 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us ApiType: 2, UserId: userId, GuestId: guestId, + Source: "upload-logo", }) if err != nil { diff --git a/server/upload/internal/types/types.go b/server/upload/internal/types/types.go index 6ac757ae..4a946586 100644 --- a/server/upload/internal/types/types.go +++ b/server/upload/internal/types/types.go @@ -13,6 +13,7 @@ type UploadFileBaseReq struct { UserId int64 `form:"user_id,optional"` // 上传文件额外信息 GuestId int64 `form:"guest_id,optional"` // 上传文件额外信息 UploadBucket int64 `form:"upload_bucket,options=[1,2],default=1"` // 上传桶名:1=缓存,2=持久 + Source string `form:"source"` // 上传来源 } type UploadLogoReq struct { @@ -28,12 +29,14 @@ type UploadFileBackendReq struct { FileKey string `form:"file_key"` // 上传唯一标识信息 FileSize int64 `form:"file_size,optional"` // 上传唯一标识信息 Metadata string `form:"meta_data,optional"` // 上传文件额外信息 + Source string `form:"source"` // 上传来源 } type UploadFilesReq struct { ApiType int64 `form:"api_type,options=[1,2],default=1"` // 调用类型：1=对外，2=对内 UploadBucket int64 `form:"upload_bucket,options=[1,2],default=1"` // 上传桶名:1=缓存,2=持久 UploadInfo string `form:"upload_info"` // 上传信息 json + Source string `form:"source"` // 上传来源 } type UploadCallbackReq struct { @@ -43,6 +46,7 @@ type UploadCallbackReq struct { ResourceUrl string `form:"resource_url"` // 资源URL Metadata string `form:"metadata,optional"` // 元数据,json格式,存储图像分率 ApiType int64 `form:"api_type,options=[1,2],default=1"` // 调用类型：1=对外，2=对内 + Source string `form:"source"` // 上传来源 } type RequestUpFile struct { diff --git a/server_api/upload.api b/server_api/upload.api index a3c7399f..85e85433 100644 --- a/server_api/upload.api +++ b/server_api/upload.api @@ -53,6 +53,7 @@ type ( UserId int64 `form:"user_id,optional"` // 上传文件额外信息 GuestId int64 `form:"guest_id,optional"` // 上传文件额外信息 UploadBucket int64 `form:"upload_bucket,options=[1,2],default=1"` // 上传桶名:1=缓存,2=持久 + Source string `form:"source"` // 上传来源 } ) @@ -72,12 +73,14 @@ type ( FileKey string `form:"file_key"` // 上传唯一标识信息 FileSize int64 `form:"file_size,optional"` // 上传唯一标识信息 Metadata string `form:"meta_data,optional"` // 上传文件额外信息 + Source string `form:"source"` // 上传来源 } UploadFilesReq { ApiType int64 `form:"api_type,options=[1,2],default=1"` // 调用类型：1=对外，2=对内 UploadBucket int64 `form:"upload_bucket,options=[1,2],default=1"` // 上传桶名:1=缓存,2=持久 UploadInfo string `form:"upload_info"` // 上传信息 json + Source string `form:"source"` // 上传来源 } UploadCallbackReq { UploadBucket int64 `form:"upload_bucket,options=[1,2],default=1"` // 上传桶名:1=缓存,2=持久 @@ -86,6 +89,7 @@ type ( ResourceUrl string `form:"resource_url"` // 资源URL Metadata string `form:"metadata,optional"` // 元数据,json格式,存储图像分率 ApiType int64 `form:"api_type,options=[1,2],default=1"` // 调用类型：1=对外，2=对内 + Source string `form:"source"` // 上传来源 } )