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

server/websocket/internal/logic/ws_ok_response.go

@@ -13,8 +13,13 @@ func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, requestId,
 	if w.debug == nil {
 		return
 	}
-	combineTakesTime := "cache"
-	uploadCombineImageTakesTime := "cache"
+	combineTakesTime := ""
+	uploadCombineImageTakesTime := ""
+	//开了缓存
+	if w.debug.IsCache != 0 {
+		combineTakesTime = "cache"
+		uploadCombineImageTakesTime = "cache"
+	}
 	if debugData != nil && debugData.DiffTimeLogoCombine > 0 {
 		combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
 	}

service/repositories/image_handle.go

@@ -138,12 +138,10 @@ type (
 		Debug                    *auth.Debug                 `json:"debug"`
 	}
 	LogoCombineRes struct {
-		ResourceId    string  `json:"resource_id"`
-		ResourceUrl   *string `json:"resource_url"`
-		ResourceCache int64   `json:"resource_cache"`
-
-		Metadata  *string         `json:"metadata"`
-		DebugData *auth.DebugData `json:"debug_data"`
+		ResourceId  string          `json:"resource_id"`
+		ResourceUrl *string         `json:"resource_url"`
+		Metadata    *string         `json:"metadata"`
+		DebugData   *auth.DebugData `json:"debug_data"`
 	}
 )
 type TemplateTagColor struct {
@@ -178,9 +176,8 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	if err == nil && resourceInfo.ResourceId != "" {
 		if in.Debug == nil || (in.Debug != nil && in.Debug.IsCache == 1) {
 			return &LogoCombineRes{
-				ResourceId:    resourceId,
-				ResourceUrl:   resourceInfo.ResourceUrl,
-				ResourceCache: 1,
+				ResourceId:  resourceId,
+				ResourceUrl: resourceInfo.ResourceUrl,
 			}, nil
 		}
 	} else {