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

---
 server/websocket/internal/logic/datatransferlogic.go | 5 -----
 server/websocket/internal/logic/ws_err_response.go   | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/server/websocket/internal/logic/datatransferlogic.go b/server/websocket/internal/logic/datatransferlogic.go
index 11b764b8..9655b171 100644
--- a/server/websocket/internal/logic/datatransferlogic.go
+++ b/server/websocket/internal/logic/datatransferlogic.go
@@ -259,11 +259,6 @@ func (l *DataTransferLogic) setConnPool(conn *websocket.Conn, userInfo *auth.Use
 	return ws, nil
 }
 
-// 获取websocket发送到前端使用的数据传输类型（debug开启是文本，否则是二进制）
-func getWebsocketBaseTransferDataFormat() int {
-	return websocket.TextMessage
-}
-
 // 获取唯一id
 func (l *DataTransferLogic) getUniqueId(userInfo *auth.UserInfo, userAgent string, retryTimes int) (uniqueId string, err error) {
 	if retryTimes < 0 {
diff --git a/server/websocket/internal/logic/ws_err_response.go b/server/websocket/internal/logic/ws_err_response.go
index 0e966684..0bc83984 100644
--- a/server/websocket/internal/logic/ws_err_response.go
+++ b/server/websocket/internal/logic/ws_err_response.go
@@ -18,7 +18,7 @@ func (l *DataTransferLogic) sendGetUniqueIdErrResponse(conn *websocket.Conn, deb
 	}
 	b, _ := json.Marshal(rsp)
 	//先发一条正常信息
-	_ = conn.WriteMessage(getWebsocketBaseTransferDataFormat(), b)
+	_ = conn.WriteMessage(websocket.TextMessage, b)
 	//发送关闭信息
 	_ = conn.WriteMessage(websocket.CloseMessage, nil)
 }
@@ -35,7 +35,7 @@ func (l *DataTransferLogic) unAuthResponse(conn *websocket.Conn, isFirefoxBrowse
 		time.Sleep(time.Second * 1) //兼容下火狐(直接发回去收不到第一条消息：有待研究)
 	}
 	//先发一条正常信息
-	_ = conn.WriteMessage(getWebsocketBaseTransferDataFormat(), b)
+	_ = conn.WriteMessage(websocket.TextMessage, b)
 	//发送关闭信息
 	_ = conn.WriteMessage(websocket.CloseMessage, nil)
 }