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

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

@ -116,6 +116,7 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
},
ProductTemplateTagGroups: req.TemplateTagGroups,
ProductTemplateV2Info: productTemplateV2Info,
Debug: userinfo.Debug,
})
if err != nil {
@ -127,7 +128,5 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
"resource_id": res.ResourceId,
"resource_url": res.ResourceUrl,
"resource_metadata": "",
"diff_time_logo_combine": res.DiffTimeLogoCombine,
"diff_time_upload_file": res.DiffTimeUploadFile,
})
}).WithDebug(res.DebugData)
}

5
service/repositories/image_handle.go
View File

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