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-10-07 12:06:27 +08:00
parent a10d41405b 8870b389be
commit fdd6ac9b44
8 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/resource/internal/types/types.go
View File

@@ -28,6 +28,9 @@ type ResourceInfoReq struct {
}
type LogoCombineReq struct {
LogoUrl string `json:"logo_url"` // 合图参数
TemplateTagColor TemplateTagColor `json:"template_tag_color"`
TemplateTagGroups []TemplateTagGroups `json:"template_tag_groups"`
TemplateId int64 `json:"template_id"` // 合图参数
TemplateTag string `json:"template_tag"` // 合图参数
Website string `json:"website,optional"` // 合图参数
@@ -35,9 +38,6 @@ type LogoCombineReq struct {
Address string `json:"address,optional"` // 合图参数
Phone string `json:"phone,optional"` // 合图参数
Qrcode string `json:"qrcode,optional"` // 合图参数
LogoUrl string `json:"logo_url"` // 合图参数
TemplateTagColor TemplateTagColor `json:"template_tag_color"`
TemplateTagGroups []TemplateTagGroups `json:"template_tag_groups"`
}
type TemplateTagColor struct {

1
server/upload/etc/upload.yaml
View File

@@ -19,6 +19,7 @@ AWS:
Secret: sjCEv0JxATnPCxno2KNLm0X8oDc7srUR+4vkYhvm
Token:
BLMService:
Version: "2"
Url: "http://18.119.109.254:8999"
# Url: "http://192.168.1.9:8999"
ImageProcess:

1
server/upload/internal/config/config.go
View File

@@ -22,6 +22,7 @@ type Config struct {
}
}
BLMService struct {
Version string
Url string
ImageProcess struct {
Url string

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

@@ -171,12 +171,9 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
logoHeight = 200
}
var resultStr string
var postMap = make(map[string]string, 1)
postMap["logo_url"] = logoUrl
resLogoStandard, err := l.svcCtx.Repositories.ImageHandle.LogoInfoSet(l.ctx, &repositories.LogoInfoSetReq{
LogoUrl: logoUrl,
Version: l.svcCtx.Config.BLMService.Version,
})
if err != nil {