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

server/upload/internal/logic/uploadlogodebuglogic.go

@@ -222,6 +222,11 @@ func (l *UploadLogoDebugLogic) UploadLogoDebug(req *types.UploadLogoDebugReq, us
 		colors := make([][]string, 0, 10)
 		SelectedColorIndex := 0
 		isDefaultTemplateTag := false
+		//查看用户素材中标签对应的颜色
+		if colorsSet, ok := mapMaterialTemplateTagColors[*templateTagInfo.TemplateTag]; ok {
+			//标签颜色
+			colors = colorsSet
+		}
 		var templateTagGroups []interface{}
 		if templateTagInfo.Groups != nil && *templateTagInfo.Groups != "" {
 			if err = json.Unmarshal([]byte(*templateTagInfo.Groups), &templateTagGroups); err != nil {
@@ -244,7 +249,14 @@ func (l *UploadLogoDebugLogic) UploadLogoDebug(req *types.UploadLogoDebugReq, us
 		})
 	}
 
-	return resp.SetStatusWithMessage(basic.CodeOK, "success", list)
+	return resp.SetStatusWithMessage(basic.CodeOK, "success", map[string]interface{}{
+		"upload_data": UploadUrl{
+			Status:      1,
+			ResourceId:  uploadRes.ResourceId,
+			ResourceUrl: uploadRes.ResourceUrl,
+		},
+		"tag_data": list,
+	})
 }
 
 // 处理逻辑后 w,r 如:重定向, resp 必须重新处理