fix:裁剪业务逻辑调整

service/repositories/image_handle.go

@@ -4,15 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"fusenapi/constants"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/curl"
 	"fusenapi/utils/file"
 	"fusenapi/utils/hash"
-	"io"
-	"strings"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -51,7 +47,9 @@ type (
 	LogoInfoSetReq struct {
 		LogoUrl string `json:"logo_url"`
 	}
-	LogoInfoSetRes struct{}
+	LogoInfoSetRes struct {
+		Res string `json:"res"`
+	}
 )
 
 func (l *defaultImageHandle) LogoInfoSet(ctx context.Context, in *LogoInfoSetReq) (*LogoInfoSetRes, error) {
@@ -59,14 +57,19 @@ func (l *defaultImageHandle) LogoInfoSet(ctx context.Context, in *LogoInfoSetReq
 	postMap := make(map[string]string, 1)
 	postMap["logo_url"] = in.LogoUrl
 
-	_, err := curl.NewClient(ctx, &curl.Config{
+	err := curl.NewClient(ctx, &curl.Config{
 		BaseUrl: *l.BLMServiceUrl,
 		Url:     constants.BLMServiceUrlLogoCombine,
-	}).PostForm(postMap, &resultBLM)
+	}).PostJson(postMap, &resultBLM)
 	if err != nil {
 		logx.Error(err)
 		return nil, err
 	}
+	if resultBLM.Code != "200" {
+		err = errors.New(resultBLM.Msg)
+		logx.Error(err)
+		return nil, err
+	}
 	return nil, nil
 }
 
@@ -166,9 +169,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 		groupOptions = templateInfo["groupOptions"].(map[string]interface{})
 	}
 
-	fmt.Println("合图开始时间：", time.Now())
-	logx.Infof("合图请求算法--开始时间：%v", time.Now())
-
 	var moduleDataMap = make(map[string]interface{}, 4)
 	moduleDataMap["id"] = productTemplateV2Info.Id
 	moduleDataMap["material"] = productTemplateV2Info.MaterialImg
@@ -185,54 +185,27 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	combineParam["qrcode"] = in.Qrcode
 
 	var postMap = make(map[string]interface{}, 2)
-	fmt.Println(combineParam)
 	postMap["module_data"] = moduleDataMap
 	postMap["param_data"] = combineParam
-	postMapB, _ := json.Marshal(postMap)
 
-	var headerData = make(map[string]string, 1)
-	headerData["Content-Type"] = "application/json"
-	result, err := curl.ApiCall(*l.BLMServiceUrl+constants.BLMServiceUrlLogoCombine, "POST", headerData, strings.NewReader(string(postMapB)), time.Minute*5)
+	var resultBLM constants.BLMServiceUrlResult
+	err = curl.NewClient(ctx, &curl.Config{
+		BaseUrl: *l.BLMServiceUrl,
+		Url:     constants.BLMServiceUrlLogoCombine,
+	}).PostJson(postMap, &resultBLM)
 
 	if err != nil {
 		logx.Error(err)
 		return nil, err
 	}
-	defer result.Body.Close()
-	b, err := io.ReadAll(result.Body)
-	if err != nil {
+
+	if resultBLM.Code != "200" {
+		err = errors.New(resultBLM.Msg)
 		logx.Error(err)
 		return nil, err
 	}
 
-	logx.Infof("合图请求算法--结束时间：%v", time.Now())
-
-	var resultStr string
-	if string(b) == "Internal Server Error" {
-		err = errors.New("BLMService fail Internal Server Error")
-		logx.Error(err)
-		return nil, err
-	} else {
-		var resData map[string]interface{}
-		err = json.Unmarshal(b, &resData)
-		if err != nil || resData == nil {
-			logx.Error(err)
-			return nil, err
-		}
-
-		if resData != nil {
-			if resData["code"].(string) == "200" {
-				resultStr = resData["data"].(string)
-			} else {
-				logx.Error(err)
-				return nil, err
-			}
-		} else {
-			logx.Error(err)
-			return nil, err
-		}
-	}
-
+	var resultStr string = resultBLM.Data.(string)
 	var resultData map[string]interface{}
 	err = json.Unmarshal([]byte(resultStr), &resultData)
 	if err != nil || resultData == nil {
@@ -240,12 +213,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 		return nil, err
 	}
 
-	fmt.Println("合图结束时间：", time.Now())
-	// {
-	// 	id: "",
-	// 	logo_url:"https://s3.amazon.com/xxxx"，
-	// 	result: "$saa541afaldjaldjasldjsadjsapsaasda"
-	// }
 	var fileBase = resultData["result"].(string)
 
 	// 上传文件
@@ -347,6 +314,13 @@ func (l *defaultImageHandle) LogoStandard(ctx context.Context, in *LogoStandardR
 		logx.Error(err)
 		return nil, err
 	}
+
+	if resultBLM.Code != "200" {
+		err = errors.New(resultBLM.Msg)
+		logx.Error(err)
+		return nil, err
+	}
+
 	var resultStr string = resultBLM.Data.(string)
 	var resultData map[string]interface{}
 	err = json.Unmarshal([]byte(resultStr), &resultData)