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

service/repositories/image_handle.go

@@ -46,7 +46,7 @@ type (
 		UserId      int64  `json:"user_id"`
 		GuestId     int64  `json:"guest_id"`
 		TemplateId  int64  `json:"template_id"`
-		TemplateTag string `json:"resource_key"`
+		TemplateTag string `json:"template_tag"`
 		Website     string `json:"website"` // 合图参数
 		Slogan      string `json:"slogan"`  // 合图参数
 		Address     string `json:"address"` // 合图参数
@@ -61,8 +61,30 @@ type (
 )
 
 func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq) (*LogoCombineRes, error) {
+
+	// 查询logo最新基础信息
+	var metadata *string
+	userMaterialModel := gmodel.NewFsUserMaterialModel(l.MysqlConn)
+	userMaterialInfo, err := userMaterialModel.FindLatestOne(ctx, in.UserId, in.GuestId)
+
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			userMaterialInfoDefault, err := userMaterialModel.FindOneById(ctx, 0)
+			if err != nil {
+				logx.Error(err)
+				return nil, err
+			}
+			metadata = userMaterialInfoDefault.Metadata
+		} else {
+			logx.Error(err)
+			return nil, err
+		}
+	} else {
+		metadata = userMaterialInfo.Metadata
+	}
+
 	// 根据hash 查询数据资源
-	var resourceId string = hash.JsonHashKey(in)
+	var resourceId string = hash.JsonHashKey(userMaterialInfo.ResourceUrl)
 
 	resourceModel := gmodel.NewFsResourceModel(l.MysqlConn)
 	resourceInfo, err := resourceModel.FindOneById(ctx, resourceId)
@@ -116,27 +138,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	moduleDataMap["groupOptions"] = groupOptions
 	moduleDataMap["materialList"] = materialList
 
-	// 查询logo最新基础信息
-	var metadata *string
-	userMaterialModel := gmodel.NewFsUserMaterialModel(l.MysqlConn)
-	userMaterialInfo, err := userMaterialModel.FindLatestOne(ctx, in.UserId, in.GuestId)
-
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			userMaterialInfoDefault, err := userMaterialModel.FindOneById(ctx, 0)
-			if err != nil {
-				logx.Error(err)
-				return nil, err
-			}
-			metadata = userMaterialInfoDefault.Metadata
-		} else {
-			logx.Error(err)
-			return nil, err
-		}
-	} else {
-		metadata = userMaterialInfo.Metadata
-	}
-
 	var combineParam map[string]interface{}
 	json.Unmarshal([]byte(*metadata), &combineParam)
 	combineParam["template_tagid"] = in.TemplateTag