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:
momo 2023-10-18 12:10:36 +08:00
commit f0e50d3cd2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import (
"fusenapi/constants" "fusenapi/constants"
"fusenapi/model/gmodel" "fusenapi/model/gmodel"
"fusenapi/service/repositories" "fusenapi/service/repositories"
"fusenapi/utils/auth"
"fusenapi/utils/curl" "fusenapi/utils/curl"
"fusenapi/utils/hash" "fusenapi/utils/hash"
"fusenapi/utils/websocket_data" "fusenapi/utils/websocket_data"
@ -132,7 +133,7 @@ func (w *wsConnectItem) consumeRenderImageData() {
}() }()
select { select {
case <-w.extendRenderProperty.renderCtx.Done(): case <-w.extendRenderProperty.renderCtx.Done():
panic("=========检测到模板标签/颜色变化，渲染取消旧的任务=======") panic("检测到模板标签/颜色变化，渲染取消旧的任务")
case <-tmpChan: case <-tmpChan:
return return
} }
@ -245,7 +246,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
return return
} }
//发送合图完毕阶段消息 //发送合图完毕阶段消息
w.sendCombineImageStepResponseMessage(renderImageData.RenderId, renderImageData.RequestId, combineImage, productSize.Id, model3dInfo.Id, productTemplate.Id, res.DiffTimeLogoCombine, res.DiffTimeUploadFile) w.sendCombineImageStepResponseMessage(renderImageData.RenderId, renderImageData.RequestId, combineImage, productSize.Id, model3dInfo.Id, productTemplate.Id, res.DebugData)
//获取唯一id //获取唯一id
taskId := w.genRenderTaskId(combineImage, renderImageData, model3dInfo, productTemplate, element) taskId := w.genRenderTaskId(combineImage, renderImageData, model3dInfo, productTemplate, element)
//查询有没有缓存的资源,有就返回 //查询有没有缓存的资源,有就返回
@ -467,17 +468,17 @@ func (w *wsConnectItem) genRenderTaskId(combineImage string, renderImageData web
// ****************************下面的发送消息的********************************* // ****************************下面的发送消息的*********************************
// 发送合图完毕阶段通知消息 // 发送合图完毕阶段通知消息
func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, requestId, combineImage string, sizeId, modelId, templateId, combineTime, uploadTime int64) { func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, requestId, combineImage string, sizeId, modelId, templateId int64, debugData *auth.DebugData) {
if w.debug == nil { if w.debug == nil {
return return
} }
combineTakesTime := "cache" combineTakesTime := "cache"
uploadCombineImageTakesTime := "cache" uploadCombineImageTakesTime := "cache"
if combineTime > 0 { if debugData.DiffTimeLogoCombine > 0 {
combineTakesTime = fmt.Sprintf("%dms", combineTime) combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
} }
if uploadTime > 0 { if debugData.DiffTimeUploadFile > 0 {
uploadCombineImageTakesTime = fmt.Sprintf("%dms", uploadTime) uploadCombineImageTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeUploadFile)
} }
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{ w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
RenderId: renderId, RenderId: renderId,