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

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson 2023-09-05 15:23:47 +08:00
commit b160b11a78
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,7 +173,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
return return
} }
//获取唯一id //获取唯一id
taskId := w.genRenderTaskId(renderImageData, model3dInfo, productTemplate, element) taskId := w.genRenderTaskId(combineImage, renderImageData, model3dInfo, productTemplate, element)
//查询有没有缓存的资源,有就返回###################### //查询有没有缓存的资源,有就返回######################
resource, err := w.logic.svcCtx.AllModels.FsResource.FindOneById(w.logic.ctx, taskId) resource, err := w.logic.svcCtx.AllModels.FsResource.FindOneById(w.logic.ctx, taskId)
if err != nil { if err != nil {
@ -492,7 +492,7 @@ func (w *wsConnectItem) modifyRenderTaskProperty(taskId string, property renderT
} }
// 组装渲染任务id // 组装渲染任务id
func (w *wsConnectItem) genRenderTaskId(renderImageData websocket_data.RenderImageReqMsg, model3dInfo *gmodel.FsProductModel3d, productTemplate *gmodel.FsProductTemplateV2, element *gmodel.FsProductTemplateElement) string { func (w *wsConnectItem) genRenderTaskId(combineImage string, renderImageData websocket_data.RenderImageReqMsg, model3dInfo *gmodel.FsProductModel3d, productTemplate *gmodel.FsProductTemplateV2, element *gmodel.FsProductTemplateElement) string {
//生成任务id(需要把user_id,guest_id设为0) //生成任务id(需要把user_id,guest_id设为0)
incomeHashParam := renderImageData.RenderData incomeHashParam := renderImageData.RenderData
incomeHashParam.UserId = 0 //设为0(渲染跟用户id无关) incomeHashParam.UserId = 0 //设为0(渲染跟用户id无关)
@ -513,6 +513,7 @@ func (w *wsConnectItem) genRenderTaskId(renderImageData websocket_data.RenderIma
"template_info": templateHashStr, "template_info": templateHashStr,
"material_image": *productTemplate.MaterialImg, "material_image": *productTemplate.MaterialImg,
"render_element": elementHashBytes, "render_element": elementHashBytes,
"combine_image": combineImage,
} }
return hash.JsonHashKey(hashMap) return hash.JsonHashKey(hashMap)
} }