fix:重构合图模块

service/repositories/image_handle.go

@@ -165,17 +165,35 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 		logx.Error(err)
 		return nil, err
 	}
-	ress := string(b)
-
-	if ress == "Internal Server Error" {
+	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 resultData map[string]interface{}
-	err = json.Unmarshal(b, &resultData)
-	if err != nil {
+	err = json.Unmarshal([]byte(resultStr), &resultData)
+	if err != nil || resultData == nil {
 		logx.Error(err)
 		return nil, err
 	}