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-18 19:34:26 +08:00
commit 565b6909cf
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/resource/etc/resource.yaml
View File

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

2
server/resource/internal/logic/logoremovebglogic.go
View File

@ -56,6 +56,6 @@ func (l *LogoRemovebgLogic) LogoRemovebg(req *types.LogoRemovebgReq, userinfo *a
"resource_id": res.ResourceId, "resource_id": res.ResourceId,
"resource_url": res.ResourceUrl, "resource_url": res.ResourceUrl,
"ismax_proportion": res.IsmaxProportion, "ismax_proportion": res.IsmaxProportion,
"img_color": req.Proportion, "img_color": res.ImgColor,
}) })
} }

8
service/repositories/image_handle.go
View File

@ -94,6 +94,10 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
hashKeyData.LogoUrl = *userMaterialInfo.ResourceUrl hashKeyData.LogoUrl = *userMaterialInfo.ResourceUrl
var resourceId string = hash.JsonHashKey(hashKeyData) var resourceId string = hash.JsonHashKey(hashKeyData)
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 != "" {
@ -132,6 +136,8 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
groupOptions = templateInfo["groupOptions"].(map[string]interface{}) groupOptions = templateInfo["groupOptions"].(map[string]interface{})
} }
fmt.Println("合图开始时间：", time.Now())
var moduleDataMap = make(map[string]interface{}, 4) var moduleDataMap = make(map[string]interface{}, 4)
moduleDataMap["id"] = productTemplateV2Info.Id moduleDataMap["id"] = productTemplateV2Info.Id
moduleDataMap["material"] = productTemplateV2Info.MaterialImg moduleDataMap["material"] = productTemplateV2Info.MaterialImg
@ -199,6 +205,8 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
logx.Error(err) logx.Error(err)
return nil, err return nil, err
} }
fmt.Println("合图结束时间：", time.Now())
// { // {
// id: "", // id: "",
// logo_url:"https://s3.amazon.com/xxxx"， // logo_url:"https://s3.amazon.com/xxxx"，