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

2023-10-18 11:57:32 +08:00
parent 616fc938cb 86547b9267
commit bbf7c06bd4
2 changed files with 9 additions and 15 deletions
--- a/server/resource/internal/logic/logocombinelogic.go
+++ b/server/resource/internal/logic/logocombinelogic.go
@@ -116,6 +116,7 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
 		},
 		ProductTemplateTagGroups: req.TemplateTagGroups,
 		ProductTemplateV2Info:    productTemplateV2Info,
+		Debug:                    userinfo.Debug,
 	})

 	if err != nil {
@@ -124,10 +125,8 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth

 	// 返回成功的响应和上传URL
 	return resp.SetStatus(basic.CodeOK, map[string]interface{}{
-		"resource_id":            res.ResourceId,
-		"resource_url":           res.ResourceUrl,
-		"resource_metadata":      "",
-		"diff_time_logo_combine": res.DiffTimeLogoCombine,
-		"diff_time_upload_file":  res.DiffTimeUploadFile,
-	})
+		"resource_id":       res.ResourceId,
+		"resource_url":      res.ResourceUrl,
+		"resource_metadata": "",
+	}).WithDebug(res.DebugData)
 }