fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson 2023-08-24 11:57:20 +08:00
commit db1e99dee2
1 changed files with 3 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

@ -114,7 +114,6 @@ func (l *DataTransferLogic) DataTransfer(w http.ResponseWriter, r *http.Request)
conn.Close() conn.Close()
return return
} }
defer ws.close()
//循环读客户端信息 //循环读客户端信息
go ws.readLoop() go ws.readLoop()
//循环把数据发送给客户端 //循环把数据发送给客户端
@ -250,6 +249,7 @@ func (w *wsConnectItem) heartbeat() {
//发送心跳信息 //发送心跳信息
if err := w.conn.WriteMessage(websocket.PongMessage, nil); err != nil { if err := w.conn.WriteMessage(websocket.PongMessage, nil); err != nil {
logx.Error("发送心跳信息异常，关闭连接:", w.uniqueId, err) logx.Error("发送心跳信息异常，关闭连接:", w.uniqueId, err)
w.close()
return return
} }
} }
@ -260,7 +260,7 @@ func (w *wsConnectItem) heartbeat() {
func (w *wsConnectItem) close() { func (w *wsConnectItem) close() {
w.mutex.Lock() w.mutex.Lock()
defer w.mutex.Unlock() defer w.mutex.Unlock()
logx.Info("websocket:", w.uniqueId, " is closing...") logx.Info("###websocket:", w.uniqueId, " uid:", w.userId, " gid:", w.guestId, " is closing....")
//发送关闭信息 //发送关闭信息
_ = w.conn.WriteMessage(websocket.CloseMessage, nil) _ = w.conn.WriteMessage(websocket.CloseMessage, nil)
w.conn.Close() w.conn.Close()
@ -269,7 +269,7 @@ func (w *wsConnectItem) close() {
w.isClose = true w.isClose = true
close(w.closeChan) close(w.closeChan)
} }
logx.Info("websocket:", w.uniqueId, " is closed") logx.Info("###websocket:", w.uniqueId, " uid:", w.userId, " gid:", w.guestId, " is closed")
} }
// 读取出口缓冲池数据输出返回给浏览器端 // 读取出口缓冲池数据输出返回给浏览器端