fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
laodaming 2023-08-22 10:36:44 +08:00
commit efe5f01bb5
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/upload/internal/logic/uploadlogologic.go
View File

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

6
service/repositories/image_handle.go
View File

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