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

server/upload/internal/logic/uploadlogologic.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
@@ -154,9 +155,10 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 	}
 	var resultStr string
 
-	var postMap = make(map[string]interface{}, 1)
+	var postMap = make(map[string]string, 1)
 	postMap["logo_url"] = uploadRes.ResourceUrl
 	postMapB, _ := json.Marshal(postMap)
+	fmt.Println(string(postMapB))
 
 	var headerData = make(map[string]string, 1)
 	headerData["Content-Type"] = "application/json"

service/repositories/image_handle.go

@@ -97,10 +97,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	json.Unmarshal(hashKeyDataB, &hashKeyDataMap)
 	var resourceId string = hash.JsonHashKey(hashKeyDataMap)
 
-	fmt.Println("hashKeyData:", hashKeyData)
-
-	fmt.Println("resourceId:", resourceId)
-
 	resourceModel := gmodel.NewFsResourceModel(l.MysqlConn)
 	resourceInfo, err := resourceModel.FindOneById(ctx, resourceId)
 	if err == nil && resourceInfo.ResourceId != "" {
@@ -179,7 +175,7 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	}
 
 	logx.Infof("合图请求算法--结束时间：%v", time.Now())
-	logx.Infof("合图请求算法--返回结果：%v", string(b))
+
 	var resultStr string
 	if string(b) == "Internal Server Error" {
 		err = errors.New("BLMService fail Internal Server Error")