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-08-25 10:28:11 +08:00
parent 4fb4def7d8
commit 7985c677f4
2 changed files with 8 additions and 8 deletions
server/websocket/internal/logic
rendernotifylogic.gows_render_image_logic.go

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

@ -83,7 +83,7 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a
Option: 2, Option: 2,
TaskId: req.TaskId, TaskId: req.TaskId,
TaskProperty: renderTask{ TaskProperty: renderTask{
UnityRenderEndTime: time.Now().UTC().Unix(), UnityRenderEndTime: time.Now().UTC().UnixMilli(),
}, },
}) })
//发送处理并删除任务 //发送处理并删除任务

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

@ -166,8 +166,8 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
b := w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{ b := w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{
RenderId: renderImageData.RenderId, RenderId: renderImageData.RenderId,
Image: *resource.ResourceUrl, Image: *resource.ResourceUrl,
CombineTakesTime: "耗时0秒(缓存)", CombineTakesTime: "(缓存)",
UnityRenderTakesTime: "耗时0秒(缓存)", UnityRenderTakesTime: "(缓存)",
}) })
//发送数据到out chan //发送数据到out chan
w.sendToOutChan(b) w.sendToOutChan(b)
@ -220,7 +220,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
Option: 2, Option: 2,
TaskId: taskId, TaskId: taskId,
TaskProperty: renderTask{ TaskProperty: renderTask{
CombineBeginTime: time.Now().UTC().Unix(), CombineBeginTime: time.Now().UTC().UnixMilli(),
}, },
}) })
//获取刀版图 //获取刀版图
@ -253,7 +253,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
Option: 2, Option: 2,
TaskId: taskId, TaskId: taskId,
TaskProperty: renderTask{ TaskProperty: renderTask{
CombineEndTime: time.Now().UTC().Unix(), CombineEndTime: time.Now().UTC().UnixMilli(),
}, },
}) })
logx.Info("合成刀版图成功,合成刀版图数据:", combineReq, ",logo图片:", info.RenderData.Logo, " 刀版图：", *res.ResourceUrl) logx.Info("合成刀版图成功,合成刀版图数据:", combineReq, ",logo图片:", info.RenderData.Logo, " 刀版图：", *res.ResourceUrl)
@ -354,7 +354,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
Option: 2, Option: 2,
TaskId: taskId, TaskId: taskId,
TaskProperty: renderTask{ TaskProperty: renderTask{
UnityRenderBeginTime: time.Now().UTC().Unix(), UnityRenderBeginTime: time.Now().UTC().UnixMilli(),
}, },
}) })
logx.Info("发送到unity成功,刀版图:", combineImage, " 请求unity的数据:", string(postDataBytes)) logx.Info("发送到unity成功,刀版图:", combineImage, " 请求unity的数据:", string(postDataBytes))
@ -426,10 +426,10 @@ func (w *wsConnectItem) operationRenderTask() {
CombineTakesTime := "" CombineTakesTime := ""
UnityRenderTakesTime := "" UnityRenderTakesTime := ""
if taskData.CombineBeginTime > 0 && taskData.CombineEndTime > 0 { if taskData.CombineBeginTime > 0 && taskData.CombineEndTime > 0 {
CombineTakesTime = fmt.Sprintf("耗时%d秒", taskData.CombineEndTime-taskData.CombineBeginTime) CombineTakesTime = fmt.Sprintf("耗时%dms", taskData.CombineEndTime-taskData.CombineBeginTime)
} }
if taskData.UnityRenderBeginTime > 0 && taskData.UnityRenderEndTime > 0 { if taskData.UnityRenderBeginTime > 0 && taskData.UnityRenderEndTime > 0 {
UnityRenderTakesTime = fmt.Sprintf("耗时%d秒", taskData.UnityRenderEndTime-taskData.UnityRenderBeginTime) UnityRenderTakesTime = fmt.Sprintf("耗时%dms", taskData.UnityRenderEndTime-taskData.UnityRenderBeginTime)
} }
//发送到出口 //发送到出口
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{ w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{