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

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming 2023-10-18 11:57:32 +08:00
commit bbf7c06bd4
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/resource/internal/logic/logocombinelogic.go
View File

@ -116,6 +116,7 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
}, },
ProductTemplateTagGroups: req.TemplateTagGroups, ProductTemplateTagGroups: req.TemplateTagGroups,
ProductTemplateV2Info: productTemplateV2Info, ProductTemplateV2Info: productTemplateV2Info,
Debug: userinfo.Debug,
}) })
if err != nil { if err != nil {
@ -124,10 +125,8 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
// 返回成功的响应和上传URL // 返回成功的响应和上传URL
return resp.SetStatus(basic.CodeOK, map[string]interface{}{ return resp.SetStatus(basic.CodeOK, map[string]interface{}{
"resource_id": res.ResourceId, "resource_id": res.ResourceId,
"resource_url": res.ResourceUrl, "resource_url": res.ResourceUrl,
"resource_metadata": "", "resource_metadata": "",
"diff_time_logo_combine": res.DiffTimeLogoCombine, }).WithDebug(res.DebugData)
"diff_time_upload_file": res.DiffTimeUploadFile,
})
} }

13
service/repositories/image_handle.go
View File

@ -131,12 +131,10 @@ type (
Debug *auth.Debug `json:"debug"` Debug *auth.Debug `json:"debug"`
} }
LogoCombineRes struct { LogoCombineRes struct {
ResourceId string ResourceId string
ResourceUrl *string ResourceUrl *string
Metadata *string Metadata *string
DiffTimeLogoCombine int64 DebugData *auth.DebugData `json:"debug_data"`
DiffTimeUploadFile int64
DebugData *auth.DebugData `json:"debug_data"`
} }
) )
type TemplateTagColor struct { type TemplateTagColor struct {
@ -314,9 +312,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
resp.ResourceId = uploadRes.ResourceId resp.ResourceId = uploadRes.ResourceId
resp.ResourceUrl = &uploadRes.ResourceUrl resp.ResourceUrl = &uploadRes.ResourceUrl
resp.DiffTimeLogoCombine = diffTimeLogoCombine
resp.DiffTimeUploadFile = diffTimeUploadFile
if in.Debug != nil { if in.Debug != nil {
resp.DebugData = &auth.DebugData{ resp.DebugData = &auth.DebugData{
DiffTimeLogoCombine: diffTimeLogoCombine, DiffTimeLogoCombine: diffTimeLogoCombine,