fix:重构合图模块

server/resource/etc/resource.yaml

@@ -15,7 +15,8 @@ AWS:
             Secret: sjCEv0JxATnPCxno2KNLm0X8oDc7srUR+4vkYhvm
             Token:
 BLMService:
-    Url: "http://18.119.109.254:8999"
+    # Url: "http://18.119.109.254:8999"
+    Url: "http://192.168.1.7:8999"
     LogoCombine:
         #Url: "http://192.168.1.7:8999/LogoCombine"
         Url: "http://18.119.109.254:8999/LogoCombine"

server/resource/internal/logic/logocombinelogic.go

@@ -57,11 +57,14 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
 		userId = userinfo.UserId
 	}
 	res, err := l.svcCtx.Repositories.ImageHandle.LogoCombine(l.ctx, &repositories.LogoCombineReq{
-		ResourceKey:  req.ResourceKey,
-		TemplateId:   req.TemplateId,
-		CombineParam: req.CombineParam,
 		UserId:      userId,
 		GuestId:     guestId,
+		TemplateId:  req.TemplateId,
+		TemplateTag: req.TemplateTag,
+		Website:     req.Website,
+		Slogan:      req.Slogan,
+		Phone:       req.Phone,
+		Address:     req.Address,
 	})
 
 	if err != nil {

server/resource/internal/types/types.go

@@ -11,9 +11,12 @@ type ResourceInfoReq struct {
 }
 
 type LogoCombineReq struct {
-	ResourceKey  string `form:"resource_key"`  // 资源唯一标识
-	CombineParam string `form:"combine_param"` // 合图参数
 	TemplateId  int64  `form:"template_id"`      // 合图参数
+	TemplateTag string `form:"template_tag"`     // 合图参数
+	Website     string `form:"website,optional"` // 合图参数
+	Slogan      string `form:"slogan,optional"`  // 合图参数
+	Address     string `form:"address,optional"` // 合图参数
+	Phone       string `form:"phone,optional"`   // 合图参数
 }
 
 type Request struct {

server_api/resource.api

@@ -26,8 +26,11 @@ type (
 
 type (
 	LogoCombineReq {
-		ResourceKey  string `form:"resource_key"`  // 资源唯一标识
-		CombineParam string `form:"combine_param"` // 合图参数
 		TemplateId  int64  `form:"template_id"`      // 合图参数
+		TemplateTag string `form:"template_tag"`     // 合图参数
+		Website     string `form:"website,optional"` // 合图参数
+		Slogan      string `form:"slogan,optional"`  // 合图参数
+		Address     string `form:"address,optional"` // 合图参数
+		Phone       string `form:"phone,optional"`   // 合图参数
 	}
 )

service/repositories/image_handle.go

@@ -43,11 +43,14 @@ type (
 /* logo合图 */
 type (
 	LogoCombineReq struct {
-		ResourceKey  string `json:"resource_key"`
-		TemplateId   int64  `json:"template_id"`
-		CombineParam string `json:"combine_param"`
 		UserId      int64  `json:"user_id"`
 		GuestId     int64  `json:"guest_id"`
+		TemplateId  int64  `json:"template_id"`
+		TemplateTag string `json:"resource_key"`
+		Website     string `form:"website,optional"` // 合图参数
+		Slogan      string `form:"slogan,optional"`  // 合图参数
+		Address     string `form:"address,optional"` // 合图参数
+		Phone       string `form:"phone,optional"`   // 合图参数
 	}
 	LogoCombineRes struct {
 		ResourceId  string
@@ -58,7 +61,8 @@ type (
 
 func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq) (*LogoCombineRes, error) {
 	// 根据hash 查询数据资源
-	var resourceId string = hash.JsonHashKey(in.ResourceKey)
+	var resourceId string = hash.JsonHashKey(in)
+
 	resourceModel := gmodel.NewFsResourceModel(l.MysqlConn)
 	resourceInfo, err := resourceModel.FindOneById(ctx, resourceId)
 	if err == nil && resourceInfo.ResourceId != "" {
@@ -111,8 +115,23 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	moduleDataMap["groupOptions"] = groupOptions
 	moduleDataMap["materialList"] = materialList
 
+	// 查询logo最新基础信息
+	userMaterialModel := gmodel.NewFsUserMaterialModel(l.MysqlConn)
+	userMaterialInfo, err := userMaterialModel.FindLatestOne(ctx, in.UserId, in.GuestId)
+
+	if err != nil {
+		logx.Error(err)
+		return nil, err
+	}
+
 	var combineParam map[string]interface{}
-	json.Unmarshal([]byte(in.CombineParam), &combineParam)
+	json.Unmarshal([]byte(*userMaterialInfo.Metadata), &combineParam)
+	combineParam["template_tagid"] = in.TemplateTag
+	combineParam["website"] = in.Website
+	combineParam["slogan"] = in.Slogan
+	combineParam["phone"] = in.Phone
+	combineParam["address"] = in.Address
+
 	var postMap = make(map[string]interface{}, 2)
 	postMap["module_data"] = moduleDataMap
 	postMap["param_data"] = combineParam