From fbbf6b984fa2b29574e60b6cd49b1c5222455f50 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Wed, 18 Oct 2023 14:40:50 +0800
Subject: [PATCH] fix

---
 server/websocket/internal/logic/datatransferlogic.go | 7 +++----
 utils/websocket_data/base_data.go                    | 3 ++-
 utils/websocket_data/render_data.go                  | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/server/websocket/internal/logic/datatransferlogic.go b/server/websocket/internal/logic/datatransferlogic.go
index 93817c8f..4d851642 100644
--- a/server/websocket/internal/logic/datatransferlogic.go
+++ b/server/websocket/internal/logic/datatransferlogic.go
@@ -238,7 +238,7 @@ func (l *DataTransferLogic) setConnPool(conn *websocket.Conn, userInfo *auth.Use
 	if isFirefoxBrowser {
 		time.Sleep(time.Second * 1) //兼容下火狐(直接发回去收不到第一条消息：有待研究)
 	}
-	ws.sendToOutChan(ws.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, websocket_data.ConnectSuccessMsg{Wid: uniqueId}))
+	ws.sendToOutChan(ws.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, websocket_data.ConnectSuccessMsg{Wid: uniqueId, Debug: ws.debug != nil}))
 	//发送累加统计连接书
 	increaseWebsocketConnectCount()
 	return ws, nil
@@ -452,9 +452,8 @@ func (w *wsConnectItem) sendToInChan(data []byte) {
 // 格式化为websocket标准返回格式
 func (w *wsConnectItem) respondDataFormat(msgType constants.Websocket, data interface{}) []byte {
 	d := websocket_data.DataTransferData{
-		T:     msgType,
-		D:     data,
-		Debug: w.debug != nil,
+		T: msgType,
+		D: data,
 	}
 	b, _ := json.Marshal(d)
 	return b
diff --git a/utils/websocket_data/base_data.go b/utils/websocket_data/base_data.go
index c3799fa4..2951c394 100644
--- a/utils/websocket_data/base_data.go
+++ b/utils/websocket_data/base_data.go
@@ -2,7 +2,8 @@ package websocket_data
 
 // 基础连接成功返回
 type ConnectSuccessMsg struct {
-	Wid string `json:"wid"`
+	Wid   string `json:"wid"`   //websocket连接唯一标识
+	Debug bool   `json:"debug"` //是否开启debug
 }
 
 // 连接失败
diff --git a/utils/websocket_data/render_data.go b/utils/websocket_data/render_data.go
index 601799f1..bcca7309 100644
--- a/utils/websocket_data/render_data.go
+++ b/utils/websocket_data/render_data.go
@@ -4,9 +4,8 @@ import "fusenapi/constants"
 
 // websocket数据交互基本数据类型
 type DataTransferData struct {
-	T     constants.Websocket `json:"t"`     //消息类型
-	D     interface{}         `json:"d"`     //传递的消息
-	Debug bool                `json:"debug"` //是否开启debug
+	T constants.Websocket `json:"t"` //消息类型
+	D interface{}         `json:"d"` //传递的消息
 }
 
 // websocket接受要云渲染处理的数据