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-10-11 18:06:40 +08:00
parent 90277394fa
commit e77638b0e1
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/websocket/internal/logic/datatransferlogic.go
View File

@ -252,7 +252,7 @@ func (l *DataTransferLogic) setConnPool(conn *websocket.Conn, userInfo *auth.Use
if isFirefoxBrowser { if isFirefoxBrowser {
time.Sleep(time.Second * 1) //兼容下火狐(直接发回去收不到第一条消息：有待研究) time.Sleep(time.Second * 1) //兼容下火狐(直接发回去收不到第一条消息：有待研究)
} }
ws.sendToOutChan(ws.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, uniqueId)) ws.sendToOutChan(ws.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, websocket_data.ConnectSuccessMsg{Wid: uniqueId}))
//发送累加统计连接书 //发送累加统计连接书
increaseWebsocketConnectCount() increaseWebsocketConnectCount()
return ws, nil return ws, nil
@ -306,7 +306,7 @@ func (l *DataTransferLogic) checkAuth(r *http.Request) (isAuth bool, userInfo *a
func (l *DataTransferLogic) unAuthResponse(conn *websocket.Conn, isFirefoxBrowser bool) { func (l *DataTransferLogic) unAuthResponse(conn *websocket.Conn, isFirefoxBrowser bool) {
rsp := websocket_data.DataTransferData{ rsp := websocket_data.DataTransferData{
T: constants.WEBSOCKET_UNAUTH, T: constants.WEBSOCKET_UNAUTH,
D: nil, D: websocket_data.ConnectUnAuth{Message: "unAuth"},
} }
b, _ := json.Marshal(rsp) b, _ := json.Marshal(rsp)
if isFirefoxBrowser { if isFirefoxBrowser {
@ -323,7 +323,7 @@ func (l *DataTransferLogic) sendGetUniqueIdErrResponse(conn *websocket.Conn) {
time.Sleep(time.Second * 1) //兼容下火狐(直接发回去收不到第一条消息：有待研究) time.Sleep(time.Second * 1) //兼容下火狐(直接发回去收不到第一条消息：有待研究)
rsp := websocket_data.DataTransferData{ rsp := websocket_data.DataTransferData{
T: constants.WEBSOCKET_CONNECT_ERR, T: constants.WEBSOCKET_CONNECT_ERR,
D: "err to gen unique id ", D: websocket_data.ConnectErrMsg{Message: "err to gen unique id "},
} }
b, _ := json.Marshal(rsp) b, _ := json.Marshal(rsp)
//先发一条正常信息 //先发一条正常信息

16
utils/websocket_data/base_data.go Normal file
View File

@ -0,0 +1,16 @@
package websocket_data
// 基础连接成功返回
type ConnectSuccessMsg struct {
Wid string `json:"wid"`
}
// 连接失败
type ConnectErrMsg struct {
Message string `json:"message"`
}
// 未授权
type ConnectUnAuth struct {
Message string `json:"message"`
}