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

合图调整

Browse Source
This commit is contained in:
momo
2023-11-22 15:01:19 +08:00
parent ead94222b6
commit ab153ea15b
4 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,11 +38,11 @@ type LogoCombineReq struct {
TemplateTagGroups []TemplateTagGroups `json:"template_tag_groups"`
TemplateId int64 `json:"template_id"` // 合图参数
TemplateTag string `json:"template_tag"` // 合图参数
Website string `json:"website,optional"` // 合图参数
Slogan string `json:"slogan,optional"` // 合图参数
Address string `json:"address,optional"` // 合图参数
Phone string `json:"phone,optional"` // 合图参数
Qrcode string `json:"qrcode,optional"` // 合图参数
Website *string `json:"website,optional"` // 合图参数
Slogan *string `json:"slogan,optional"` // 合图参数
Address *string `json:"address,optional"` // 合图参数
Phone *string `json:"phone,optional"` // 合图参数
Qrcode *string `json:"qrcode,optional"` // 合图参数
}
type TemplateTagColor struct {

19
server/websocket/internal/logic/ws_render_image.go
View File

@@ -12,10 +12,11 @@ import (
"fusenapi/utils/curl"
"fusenapi/utils/hash"
"fusenapi/utils/websocket_data"
"github.com/zeromicro/go-zero/core/logx"
"gorm.io/gorm"
"strconv"
"time"
"github.com/zeromicro/go-zero/core/logx"
"gorm.io/gorm"
)
var (
@@ -214,12 +215,12 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
ProductTemplateV2Info: productTemplate,
ProductTemplateTagGroups: renderImageData.RenderData.TemplateTagGroups,
TemplateTag: renderImageData.RenderData.TemplateTag,
Website: renderImageData.RenderData.Website,
Slogan: renderImageData.RenderData.Slogan,
Address: renderImageData.RenderData.Address,
Phone: renderImageData.RenderData.Phone,
Qrcode: renderImageData.RenderData.Qrcode,
LogoUrl: renderImageData.RenderData.Logo,
// Website: &renderImageData.RenderData.Website,
// Slogan: &renderImageData.RenderData.Slogan,
// Address: &renderImageData.RenderData.Address,
// Phone: &renderImageData.RenderData.Phone,
// Qrcode: &renderImageData.RenderData.Qrcode,
LogoUrl: renderImageData.RenderData.Logo,
TemplateTagColor: repositories.TemplateTagColor{
Color: renderImageData.RenderData.TemplateTagColor.Colors,
Index: renderImageData.RenderData.TemplateTagColor.SelectedColorIndex,
@@ -273,7 +274,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
RenderProcessTime: &websocket_data.RenderProcessTime{
UnityRenderTakesTime: "cache",
UploadUnityRenderImageTakesTime: "cache",
UnityRealTakesTime: "cache",
UnityRealTakesTime: "cache",
},
})
return