From 1bd606a89c6ea6b0392931229b121f6caff56048 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 2 Nov 2023 10:10:22 +0800 Subject: [PATCH] fix --- server/websocket/internal/logic/rendernotifylogic.go | 2 +- server/websocket/internal/logic/ws_ok_response.go | 2 +- server/websocket/internal/logic/ws_render_image.go | 2 +- utils/websocket_data/render_data.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/websocket/internal/logic/rendernotifylogic.go b/server/websocket/internal/logic/rendernotifylogic.go index de5124dc..1d08b889 100644 --- a/server/websocket/internal/logic/rendernotifylogic.go +++ b/server/websocket/internal/logic/rendernotifylogic.go @@ -99,7 +99,7 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a ws.sendRenderResultData(websocket_data.RenderImageRspMsg{ RequestId: requestId, Image: uploadRes.ResourceUrl, - RenderProcessTime: websocket_data.RenderProcessTime{ + RenderProcessTime: &websocket_data.RenderProcessTime{ UnityRenderTakesTime: fmt.Sprintf("%dms", unityRenderEndTime-unityRenderBeginTime), UploadUnityRenderImageTakesTime: fmt.Sprintf("%dms", uploadUnityRenderImageTakesTime), }, diff --git a/server/websocket/internal/logic/ws_ok_response.go b/server/websocket/internal/logic/ws_ok_response.go index 5c81991a..bcfd7cfb 100644 --- a/server/websocket/internal/logic/ws_ok_response.go +++ b/server/websocket/internal/logic/ws_ok_response.go @@ -61,7 +61,7 @@ func (w *wsConnectItem) sendRenderDataToUnityStepResponseMessage(requestId strin func (w *wsConnectItem) sendRenderResultData(data websocket_data.RenderImageRspMsg) { //没开启debug if w.debug == nil { - data.RenderProcessTime = websocket_data.RenderProcessTime{} + data.RenderProcessTime = nil } w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, data)) } diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 914c3172..5c88d428 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -258,7 +258,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe w.sendRenderResultData(websocket_data.RenderImageRspMsg{ RequestId: renderImageData.RequestId, Image: *resource.ResourceUrl, - RenderProcessTime: websocket_data.RenderProcessTime{ + RenderProcessTime: &websocket_data.RenderProcessTime{ UnityRenderTakesTime: "cache", UploadUnityRenderImageTakesTime: "cache", }, diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go index 508640e2..c0047b55 100644 --- a/utils/websocket_data/render_data.go +++ b/utils/websocket_data/render_data.go @@ -28,9 +28,9 @@ type TemplateTagColor struct { // websocket发送渲染完的数据 type RenderImageRspMsg struct { - RequestId string `json:"request_id"` - Image string `json:"image"` //渲染结果图片 - RenderProcessTime RenderProcessTime `json:"render_process_time"` //流程耗时 + RequestId string `json:"request_id"` + Image string `json:"image"` //渲染结果图片 + RenderProcessTime *RenderProcessTime `json:"render_process_time"` //流程耗时 } type RenderProcessTime struct { UnityRenderTakesTime string `json:"unity_render_takes_time"` //unity渲染用时