发布v2.5.3版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

server/internal/library/network/tcp/server_handle.go

@@ -1,8 +1,8 @@
 package tcp
 
 import (
+	"context"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/gtcp"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -12,75 +12,73 @@ import (
 	"hotgo/utility/convert"
 )
 
-func (server *Server) onServerLogin(args ...interface{}) {
+func (server *Server) onServerLogin(ctx context.Context, args ...interface{}) {
 	var (
 		in     = new(msgin.ServerLogin)
-		conn   = args[1].(*gtcp.Conn)
+		user   = GetCtx(ctx)
 		res    = new(msgin.ResponseServerLogin)
 		models *entity.SysServeLicense
 	)
 
 	if err := gconv.Scan(args[0], &in); err != nil {
-		server.Logger.Infof(server.Ctx, "onServerLogin message Scan failed:%+v, args:%+v", err, args)
+		server.Logger.Warningf(ctx, "onServerLogin message Scan failed:%+v, args:%+v", err, args)
 		return
 	}
-	server.Logger.Infof(server.Ctx, "onServerLogin in:%+v", *in)
 
-	err := g.Model("sys_serve_license").
-		Ctx(server.Ctx).
+	err := g.Model("sys_serve_license").Ctx(ctx).
 		Where("appid = ?", in.AppId).
 		Scan(&models)
 
 	if err != nil {
 		res.Code = 1
 		res.Message = err.Error()
-		server.Write(conn, res)
+		server.Write(user.Conn, res)
 		return
 	}
 
 	if models == nil {
 		res.Code = 2
 		res.Message = "授权信息不存在"
-		server.Write(conn, res)
+		server.Write(user.Conn, res)
 		return
 	}
 
 	// 验证签名
-	if err = VerifySign(in, models.Appid, models.SecretKey); err != nil {
+	if _, err = VerifySign(in, models.Appid, models.SecretKey); err != nil {
 		res.Code = 3
 		res.Message = "签名错误，请联系管理员"
-		server.Write(conn, res)
+		server.Write(user.Conn, res)
 		return
 	}
 
 	if models.Status != consts.StatusEnabled {
 		res.Code = 4
 		res.Message = "授权已禁用，请联系管理员"
-		server.Write(conn, res)
+		server.Write(user.Conn, res)
 		return
 	}
 
 	if models.Group != in.Group {
 		res.Code = 5
 		res.Message = "你登录的授权分组未得到授权，请联系管理员"
-		server.Write(conn, res)
+		server.Write(user.Conn, res)
 		return
 	}
 
 	if models.EndAt.Before(gtime.Now()) {
 		res.Code = 6
 		res.Message = "授权已过期，请联系管理员"
-		server.Write(conn, res)
+		server.Write(user.Conn, res)
 		return
 	}
 
 	allowedIps := convert.IpFilterStrategy(models.AllowedIps)
 	if _, ok := allowedIps["*"]; !ok {
-		ip := gstr.StrTillEx(conn.RemoteAddr().String(), ":")
+		ip := gstr.StrTillEx(user.Conn.RemoteAddr().String(), ":")
 		if _, ok2 := allowedIps[ip]; !ok2 {
 			res.Code = 7
 			res.Message = "IP(" + ip + ")未授权，请联系管理员"
-			server.Write(conn, res)
+			server.Write(user.Conn, res)
 			return
 		}
 	}
@@ -99,14 +97,14 @@ func (server *Server) onServerLogin(args ...interface{}) {
 		}
 
 		// 当前连接也踢掉
-		server.Write(conn, res2)
-		conn.Close()
+		server.Write(user.Conn, res2)
+		user.Conn.Close()
 		return
 	}
 
 	server.mutexConns.Lock()
-	server.clients[conn.RemoteAddr().String()] = &ClientConn{
-		Conn: conn,
+	server.clients[user.Conn.RemoteAddr().String()] = &ClientConn{
+		Conn: user.Conn,
 		Auth: &AuthMeta{
 			Group:     in.Group,
 			Name:      in.Name,
@@ -118,39 +116,46 @@ func (server *Server) onServerLogin(args ...interface{}) {
 	}
 	server.mutexConns.Unlock()
 
-	server.Write(conn, res)
-
-	_, err = g.Model("sys_serve_license").
-		Ctx(server.Ctx).
+	_, err = g.Model("sys_serve_license").Ctx(ctx).
 		Where("id = ?", models.Id).Data(g.Map{
 		"online":         online,
 		"login_times":    models.LoginTimes + 1,
 		"last_login_at":  gtime.Now(),
 		"last_active_at": gtime.Now(),
-		"remote_addr":    conn.RemoteAddr().String(),
+		"remote_addr":    user.Conn.RemoteAddr().String(),
 	}).Update()
 	if err != nil {
-		server.Logger.Warningf(server.Ctx, "onServerLogin Update err:%+v", err)
+		server.Logger.Warningf(ctx, "onServerLogin Update err:%+v", err)
 	}
+
+	res.AppId = in.AppId
+	res.Code = consts.TCPMsgCodeSuccess
+	server.Write(user.Conn, res)
 }
 
-func (server *Server) onServerHeartbeat(args ...interface{}) {
-	var in *msgin.ServerHeartbeat
-	if err := gconv.Scan(args, &in); err != nil {
-		server.Logger.Infof(server.Ctx, "onServerHeartbeat message Scan failed:%+v, args:%+v", err, args)
+func (server *Server) onServerHeartbeat(ctx context.Context, args ...interface{}) {
+	var (
+		in  *msgin.ServerHeartbeat
+		res = new(msgin.ResponseServerHeartbeat)
+	)
+
+	if err := gconv.Scan(args[0], &in); err != nil {
+		server.Logger.Warningf(ctx, "onServerHeartbeat message Scan failed:%+v, args:%+v", err, args)
 		return
 	}
+
 	client := args[1].(*ClientConn)
 	client.heartbeat = gtime.Timestamp()
 
-	server.Write(client.Conn, &msgin.ResponseServerHeartbeat{})
-
-	_, err := g.Model("sys_serve_license").
-		Ctx(server.Ctx).
+	_, err := g.Model("sys_serve_license").Ctx(ctx).
 		Where("appid = ?", client.Auth.AppId).Data(g.Map{
 		"last_active_at": gtime.Now(),
 	}).Update()
 	if err != nil {
-		server.Logger.Warningf(server.Ctx, "onServerHeartbeat Update err:%+v", err)
+		server.Logger.Warningf(ctx, "onServerHeartbeat Update err:%+v", err)
 	}
+
+	res.Code = consts.TCPMsgCodeSuccess
+	server.Write(client.Conn, res)
+
 }