refactor: code review

This commit is contained in:
meilin.huang
2023-10-20 21:31:46 +08:00
parent 45d2449221
commit 10f6b03fb5
15 changed files with 270 additions and 209 deletions

View File

@@ -4,6 +4,7 @@ import (
"mayfly-go/pkg/biz"
"mayfly-go/pkg/logx"
"mayfly-go/pkg/req"
"mayfly-go/pkg/utils/anyx"
"mayfly-go/pkg/ws"
"github.com/gin-gonic/gin"
@@ -18,9 +19,10 @@ func (s *System) ConnectWs(g *gin.Context) {
wsConn, err := ws.Upgrader.Upgrade(g.Writer, g.Request, nil)
defer func() {
if err := recover(); err != nil {
logx.ErrorTrace("websocket连接失败: ", err.(error))
errInfo := anyx.ToString(err)
logx.Error("websocket连接失败: ", errInfo)
if wsConn != nil {
wsConn.WriteMessage(websocket.TextMessage, []byte(err.(error).Error()))
wsConn.WriteMessage(websocket.TextMessage, []byte(errInfo))
wsConn.Close()
}
}
@@ -32,9 +34,8 @@ func (s *System) ConnectWs(g *gin.Context) {
// 权限校验
rc := req.NewCtxWithGin(g)
if err = req.PermissionHandler(rc); err != nil {
panic("sys ws连接没有权限")
}
err = req.PermissionHandler(rc)
biz.ErrIsNil(err, "sys websocket没有权限连接")
// 登录账号信息
la := rc.LoginAccount