From e14fd8b28680338357d0e0bf8a41af2aa3dec148 Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Wed, 18 Oct 2023 11:48:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=9B=BE=E6=96=B0=E5=A2=9Edebug?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/repositories/image_handle.go | 31 +++++++++++++++++++---------
 utils/auth/user.go                   |  6 ++++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/service/repositories/image_handle.go b/service/repositories/image_handle.go
index f5036756..170eeb1c 100644
--- a/service/repositories/image_handle.go
+++ b/service/repositories/image_handle.go
@@ -136,6 +136,7 @@ type (
 		Metadata            *string
 		DiffTimeLogoCombine int64
 		DiffTimeUploadFile  int64
+		DebugData           *auth.DebugData `json:"debug_data"`
 	}
 )
 type TemplateTagColor struct {
@@ -144,6 +145,7 @@ type TemplateTagColor struct {
 }
 
 func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq) (*LogoCombineRes, error) {
+	var resp = &LogoCombineRes{}
 	logoResourceId := s3url_to_s3id.GetS3ResourceIdFormUrl(in.LogoUrl)
 	if logoResourceId == "" {
 		return nil, errors.New("invalid logo url")
@@ -167,10 +169,12 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	resourceModel := gmodel.NewFsResourceModel(l.MysqlConn)
 	resourceInfo, err := resourceModel.FindOneById(ctx, resourceId)
 	if err == nil && resourceInfo.ResourceId != "" {
-		return &LogoCombineRes{
-			ResourceId:  resourceId,
-			ResourceUrl: resourceInfo.ResourceUrl,
-		}, nil
+		if in.Debug == nil || (in.Debug != nil && in.Debug.IsCache == 1) {
+			return &LogoCombineRes{
+				ResourceId:  resourceId,
+				ResourceUrl: resourceInfo.ResourceUrl,
+			}, nil
+		}
 	} else {
 		if err != nil {
 			if !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -308,12 +312,19 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 		return nil, err
 	}
 
-	return &LogoCombineRes{
-		ResourceId:          uploadRes.ResourceId,
-		ResourceUrl:         &uploadRes.ResourceUrl,
-		DiffTimeLogoCombine: diffTimeLogoCombine,
-		DiffTimeUploadFile:  diffTimeUploadFile,
-	}, nil
+	resp.ResourceId = uploadRes.ResourceId
+	resp.ResourceUrl = &uploadRes.ResourceUrl
+	resp.DiffTimeLogoCombine = diffTimeLogoCombine
+	resp.DiffTimeUploadFile = diffTimeUploadFile
+
+	if in.Debug != nil {
+		resp.DebugData = &auth.DebugData{
+			DiffTimeLogoCombine: diffTimeLogoCombine,
+			DiffTimeUploadFile:  diffTimeUploadFile,
+		}
+	}
+
+	return resp, nil
 }
 
 /* logo合图 */
diff --git a/utils/auth/user.go b/utils/auth/user.go
index 8c9e2ca5..b1d43087 100644
--- a/utils/auth/user.go
+++ b/utils/auth/user.go
@@ -24,6 +24,12 @@ const (
 	IDTYPE_Guest IDTYPE = 2
 )
 
+// DebugData
+type DebugData struct {
+	DiffTimeLogoCombine int64 `json:"diff_time_logo_combine"` // 合图算法时间
+	DiffTimeUploadFile  int64 `json:"diff_time_upload_file"`  // 合图上传时间
+}
+
 // Debug 相关的结构
 type Debug struct {
 	Exp              *int64 `json:"exp"`