From c4f888a52f24733c93404f89348c9cb563eda677 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Fri, 25 Aug 2023 12:01:01 +0800
Subject: [PATCH] fix

---
 .../internal/logic/ws_render_image_logic.go        | 14 ++++++++------
 utils/websocket_data/render_data.go                | 11 +++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/server/websocket/internal/logic/ws_render_image_logic.go b/server/websocket/internal/logic/ws_render_image_logic.go
index 170e363c..dcd89aa3 100644
--- a/server/websocket/internal/logic/ws_render_image_logic.go
+++ b/server/websocket/internal/logic/ws_render_image_logic.go
@@ -438,12 +438,14 @@ func (w *wsConnectItem) operationRenderTask() {
 					}
 					//发送到出口
 					w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{
-						RenderId:                        taskData.RenderId,
-						Image:                           data.RenderNotifyImageUrl,
-						CombineTakesTime:                CombineTakesTime,
-						UnityRenderTakesTime:            UnityRenderTakesTime,
-						UploadCombineImageTakesTime:     uploadCombineImageTakesTime,
-						UploadUnityRenderImageTakesTime: uploadUnityRenderImageTakesTime,
+						RenderId: taskData.RenderId,
+						Image:    data.RenderNotifyImageUrl,
+						RenderProcessTime: websocket_data.RenderProcessTime{
+							CombineTakesTime:                CombineTakesTime,
+							UnityRenderTakesTime:            UnityRenderTakesTime,
+							UploadCombineImageTakesTime:     uploadCombineImageTakesTime,
+							UploadUnityRenderImageTakesTime: uploadUnityRenderImageTakesTime,
+						},
 					}))
 				}
 				//删除任务
diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go
index 0a88f86b..e6ddfb93 100644
--- a/utils/websocket_data/render_data.go
+++ b/utils/websocket_data/render_data.go
@@ -27,14 +27,13 @@ type RenderData struct {
 
 // websocket发送渲染完的数据
 type RenderImageRspMsg struct {
-	RenderId                        string `json:"render_id"`                            //渲染id
-	Image                           string `json:"image"`                                //渲染结果图片
+	RenderId          string            `json:"render_id"`           //渲染id
+	Image             string            `json:"image"`               //渲染结果图片
+	RenderProcessTime RenderProcessTime `json:"render_process_time"` //流程耗时
+}
+type RenderProcessTime struct {
 	CombineTakesTime                string `json:"combine_takes_time"`                   //合图需要时间
 	UnityRenderTakesTime            string `json:"unity_render_takes_time"`              //unity渲染用时
 	UploadCombineImageTakesTime     string `json:"upload_combine_image_takes_time"`      //上传刀版图耗时
 	UploadUnityRenderImageTakesTime string `json:"upload_unity_render_image_takes_time"` //上传unity渲染结果图时间
 }
-type ThirdPartyLoginRspMsg struct {
-	//websocket三方登录的通知数据
-	Token string `json:"token"`
-}