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-30 15:03:12 +08:00
commit 6688e5f830
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/upload/internal/logic/uploadlogodebuglogic.go
View File

@ -222,6 +222,11 @@ func (l *UploadLogoDebugLogic) UploadLogoDebug(req *types.UploadLogoDebugReq, us
colors := make([][]string, 0, 10) colors := make([][]string, 0, 10)
SelectedColorIndex := 0 SelectedColorIndex := 0
isDefaultTemplateTag := false isDefaultTemplateTag := false
//查看用户素材中标签对应的颜色
if colorsSet, ok := mapMaterialTemplateTagColors[*templateTagInfo.TemplateTag]; ok {
//标签颜色
colors = colorsSet
}
var templateTagGroups []interface{} var templateTagGroups []interface{}
if templateTagInfo.Groups != nil && *templateTagInfo.Groups != "" { if templateTagInfo.Groups != nil && *templateTagInfo.Groups != "" {
if err = json.Unmarshal([]byte(*templateTagInfo.Groups), &templateTagGroups); err != nil { if err = json.Unmarshal([]byte(*templateTagInfo.Groups), &templateTagGroups); err != nil {
@ -244,7 +249,14 @@ func (l *UploadLogoDebugLogic) UploadLogoDebug(req *types.UploadLogoDebugReq, us
}) })
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", list) return resp.SetStatusWithMessage(basic.CodeOK, "success", map[string]interface{}{
"upload_data": UploadUrl{
Status: 1,
ResourceId: uploadRes.ResourceId,
ResourceUrl: uploadRes.ResourceUrl,
},
"tag_data": list,
})
} }
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理 // 处理逻辑后 w,r 如:重定向, resp 必须重新处理