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

fix

Browse Source
This commit is contained in:
laodaming 2023-07-27 16:13:06 +08:00
parent 7297a1ef02
commit 5532cd1a11
5 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/websocket/internal/logic/datatransferlogic.go
View File

@ -241,8 +241,8 @@ func (w *wsConnectItem) sendToOutChan(data []byte) {
} }
// 获取需要渲染图片的map key // 获取需要渲染图片的map key
func (w *wsConnectItem) getRenderImageMapKey(productId, templateTagId int64) string { func (w *wsConnectItem) getRenderImageMapKey(productId, templateTagId int64, algorithmVersion string) string {
return fmt.Sprintf("%d-%d", productId, templateTagId) return fmt.Sprintf("%d-%d-%s", productId, templateTagId, algorithmVersion)
} }
// 处理接受到的数据 // 处理接受到的数据

4
server/websocket/internal/logic/rendernotifylogic.go
View File

@ -50,7 +50,7 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq) (resp *basi
h.Write([]byte(fmt.Sprintf(constants.RENDER_NOTIFY_SIGN_KEY, string(notifyByte), req.Time))) h.Write([]byte(fmt.Sprintf(constants.RENDER_NOTIFY_SIGN_KEY, string(notifyByte), req.Time)))
signHex := h.Sum(nil) signHex := h.Sum(nil)
sign := hex.EncodeToString(signHex) sign := hex.EncodeToString(signHex)
fmt.Println(sign) //fmt.Println(sign)
if req.Sign != sign { if req.Sign != sign {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid sign") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid sign")
} }
@ -61,7 +61,7 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq) (resp *basi
if !ok { if !ok {
return true return true
} }
renderKey := ws.getRenderImageMapKey(req.Info.ProductId, req.Info.TemplateTagId) renderKey := ws.getRenderImageMapKey(req.Info.ProductId, req.Info.TemplateTagId, req.Info.AlgorithmVersion)
//查询有无该渲染任务 //查询有无该渲染任务
_, ok = ws.renderProperty.renderImageTask[renderKey] _, ok = ws.renderProperty.renderImageTask[renderKey]
if !ok { if !ok {

2
server/websocket/internal/logic/ws_render_image_logic.go
View File

@ -33,7 +33,7 @@ func (w *wsConnectItem) SendToCloudRender(data []byte) {
return return
default: default:
//加入渲染任务 //加入渲染任务
key := w.getRenderImageMapKey(productId, renderImageData.TemplateTagId) key := w.getRenderImageMapKey(productId, renderImageData.TemplateTagId, renderImageData.AlgorithmVersion)
w.renderProperty.renderImageTaskCtlChan <- renderImageControlChanItem{ w.renderProperty.renderImageTaskCtlChan <- renderImageControlChanItem{
Option: 1, //0删除 1添加 Option: 1, //0删除 1添加
Key: key, Key: key,

5
server/websocket/internal/types/types.go
View File

@ -13,11 +13,13 @@ type DataTransferData struct {
type RenderImageReqMsg struct { type RenderImageReqMsg struct {
ProductIds []int64 `json:"product_ids"` //产品 id ProductIds []int64 `json:"product_ids"` //产品 id
TemplateTagId int64 `json:"template_tag_id"` //模板标签id TemplateTagId int64 `json:"template_tag_id"` //模板标签id
AlgorithmVersion string `json:"algorithm_version,optional"` //算法版本
} }
type RenderImageRspMsg struct { type RenderImageRspMsg struct {
ProductId int64 `json:"product_id"` //产品 id ProductId int64 `json:"product_id"` //产品 id
TemplateTagId int64 `json:"template_tag_id"` //模板标签id TemplateTagId int64 `json:"template_tag_id"` //模板标签id
AlgorithmVersion string `json:"algorithm_version,optional"` //算法版本
Image string `json:"image"` //渲染后的图片 Image string `json:"image"` //渲染后的图片
} }
@ -28,8 +30,9 @@ type RenderNotifyReq struct {
} }
type NotifyInfo struct { type NotifyInfo struct {
ProductId int64 `json:"product_id"` ProductId int64 `json:"product_id"` //产品id
TemplateTagId int64 `json:"template_tag_id"` //模板标签id TemplateTagId int64 `json:"template_tag_id"` //模板标签id
AlgorithmVersion string `json:"algorithm_version,optional"` //算法版本
Image string `json:"image"` Image string `json:"image"`
} }

5
server_api/websocket.api
View File

@ -25,10 +25,12 @@ type DataTransferData {
type RenderImageReqMsg { //websocket接受要云渲染处理的数据 type RenderImageReqMsg { //websocket接受要云渲染处理的数据
ProductIds []int64 `json:"product_ids"` //产品 id ProductIds []int64 `json:"product_ids"` //产品 id
TemplateTagId int64 `json:"template_tag_id"` //模板标签id TemplateTagId int64 `json:"template_tag_id"` //模板标签id
AlgorithmVersion string `json:"algorithm_version,optional"` //算法版本
} }
type RenderImageRspMsg { //websocket发送渲染完的数据 type RenderImageRspMsg { //websocket发送渲染完的数据
ProductId int64 `json:"product_id"` //产品 id ProductId int64 `json:"product_id"` //产品 id
TemplateTagId int64 `json:"template_tag_id"` //模板标签id TemplateTagId int64 `json:"template_tag_id"` //模板标签id
AlgorithmVersion string `json:"algorithm_version,optional"` //算法版本
Image string `json:"image"` //渲染后的图片 Image string `json:"image"` //渲染后的图片
} }
//渲染完了通知接口 //渲染完了通知接口
@ -38,7 +40,8 @@ type RenderNotifyReq {
Info NotifyInfo `json:"info"` Info NotifyInfo `json:"info"`
} }
type NotifyInfo { type NotifyInfo {
ProductId int64 `json:"product_id"` ProductId int64 `json:"product_id"` //产品id
TemplateTagId int64 `json:"template_tag_id"` //模板标签id TemplateTagId int64 `json:"template_tag_id"` //模板标签id
AlgorithmVersion string `json:"algorithm_version,optional"` //算法版本
Image string `json:"image"` Image string `json:"image"`
} }