OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: ws取消logout字符串退出，当退出后消息读取EOF退出协程

Browse Source
This commit is contained in:
TsMask
2024-04-01 16:44:27 +08:00
parent 83cd653545
commit a7bb0db03a
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/ws/controller/ws.go
View File

@@ -196,11 +196,11 @@ func (s *WSController) SSH(c *gin.Context) {
wsClient.MsgChan <- msgByte wsClient.MsgChan <- msgByte
// 退出ssh登录 // 退出ssh登录
if strings.LastIndex(outputStr, "logout\r\n") != -1 { // if strings.LastIndex(outputStr, "logout\r\n") != -1 {
time.Sleep(1 * time.Second) // time.Sleep(1 * time.Second)
s.wsService.CloseClient(wsClient.ID) // s.wsService.CloseClient(wsClient.ID)
return // return
} // }
} }
} }
}() }()
@@ -283,11 +283,11 @@ func (s *WSController) Telnet(c *gin.Context) {
wsClient.MsgChan <- msgByte wsClient.MsgChan <- msgByte
// 退出telnet登录 // 退出telnet登录
if strings.LastIndex(outputStr, "logout\r\n") != -1 { // if strings.LastIndex(outputStr, "logout\r\n") != -1 {
time.Sleep(1 * time.Second) // time.Sleep(1 * time.Second)
s.wsService.CloseClient(wsClient.ID) // s.wsService.CloseClient(wsClient.ID)
return // return
} // }
} }
} }
}() }()

6
src/modules/ws/service/ws_receive.impl.go
View File

@@ -3,6 +3,7 @@ package service
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"time" "time"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
@@ -83,6 +84,11 @@ func (s *WSReceiveImpl) AsyncReceive(client *model.WSClient, reqMsg model.WSRequ
logger.Warnf("ws AsyncReceive UID %s err: %s", client.BindUid, err.Error()) logger.Warnf("ws AsyncReceive UID %s err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(result.ErrMsg(err.Error())) msgByte, _ := json.Marshal(result.ErrMsg(err.Error()))
client.MsgChan <- msgByte client.MsgChan <- msgByte
if err == io.EOF {
// 等待1s后关闭连接
time.Sleep(1 * time.Second)
client.StopChan <- struct{}{}
}
return return
} }
if len(resByte) > 0 { if len(resByte) > 0 {