diff --git a/go.mod b/go.mod index edd2212..1d23998 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.24.0 require ( bou.ke/monkey v1.0.2 - git.hlsq.asia/mmorpg/service-common v0.0.0-20260130025300-427fca7ed19f + git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed github.com/alicebob/miniredis/v2 v2.35.0 github.com/gin-contrib/cors v1.7.6 github.com/gin-gonic/gin v1.11.0 diff --git a/go.sum b/go.sum index f81c26b..e4a539e 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ bou.ke/monkey v1.0.2 h1:kWcnsrCNUatbxncxR/ThdYqbytgOIArtYWqcQLQzKLI= bou.ke/monkey v1.0.2/go.mod h1:OqickVX3tNx6t33n1xvtTtu85YN5s6cKwVug+oHMaIA= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -git.hlsq.asia/mmorpg/service-common v0.0.0-20260130025300-427fca7ed19f h1:U0HnB8i3ZTKrg3XBQpwFcI64LB6mraj02yNAqV3MBws= -git.hlsq.asia/mmorpg/service-common v0.0.0-20260130025300-427fca7ed19f/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed h1:O08p0egfekFqQSnc4sfEJUTI5dGiEyiDRNW/VYa/Ce4= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I= github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/IBM/sarama v1.46.3 h1:njRsX6jNlnR+ClJ8XmkO+CM4unbrNr/2vB5KK6UA+IE= diff --git a/internal/global/global.go b/internal/global/global.go index c32fc3d..66bf7d0 100644 --- a/internal/global/global.go +++ b/internal/global/global.go @@ -10,7 +10,7 @@ const ( ServiceStatusStopping // 停止中 ) -var GatewaySID string +var GatewaySID int64 const ( KeyGatewayAccessToken = "gateway:token:access:%v" diff --git a/internal/grpc_server/server.go b/internal/grpc_server/server.go index 1a44313..df3d5bb 100644 --- a/internal/grpc_server/server.go +++ b/internal/grpc_server/server.go @@ -25,7 +25,7 @@ func (s *Server) ToClient(server grpc_pb.Gateway_ToClientServer) error { if args, err := server.Recv(); err != nil { return } else { - if args.USN == "" { + if args.USN == -1 { //utils.WorkerPool(ws_handler.UserMgr.GetAllInterface(), func(task interface{}) { // client := task.(*ws_handler.Client) diff --git a/internal/handler/http_handler/login.go b/internal/handler/http_handler/login.go index 4d9900d..8410095 100644 --- a/internal/handler/http_handler/login.go +++ b/internal/handler/http_handler/login.go @@ -24,7 +24,7 @@ type LoginReq struct { } type LoginResp struct { - USN string `json:"usn"` + USN int64 `json:"usn"` Name string `json:"name"` AccessToken string `json:"accessToken"` RefreshToken string `json:"refreshToken"` @@ -43,7 +43,7 @@ func Login(c *gin.Context) { return } - usn, name := "", "" + usn, name := int64(0), "" if req.Phone != "" { // TODO 校验验证码 login, err := client.PhoneLogin(c, &grpc_pb.PhoneLoginReq{ @@ -117,7 +117,7 @@ func RefreshToken(c *gin.Context) { })) } -func genToken(ctx context.Context, usn string) (string, string, error) { +func genToken(ctx context.Context, usn int64) (string, string, error) { at, err := genTokenOne(ctx, global.KeyGatewayAccessToken, usn, time.Duration(config.Get().Auth.ShortExpire)*time.Minute) if err != nil { return "", "", err @@ -129,7 +129,7 @@ func genToken(ctx context.Context, usn string) (string, string, error) { return at, rt, nil } -func genTokenOne(ctx context.Context, key string, usn string, ttl time.Duration) (string, error) { +func genTokenOne(ctx context.Context, key string, usn int64, ttl time.Duration) (string, error) { token, err := utils.GenToken(usn, config.Get().Auth.Secret, ttl) if err != nil { return "", err diff --git a/internal/handler/ws_handler/client/client.go b/internal/handler/ws_handler/client/client.go index e2b909f..657f6a5 100644 --- a/internal/handler/ws_handler/client/client.go +++ b/internal/handler/ws_handler/client/client.go @@ -22,14 +22,14 @@ type Client struct { cancel context.CancelFunc // 取消上下文 heartBeat time.Time // 最后一次心跳 - Status int32 // 状态:0 登陆中 1 正常 2 离线 - USN string // 用户ID - SceneSID string // 场景服ID - InstanceID int32 // 副本ID,副本类型 - UniqueNo string // 副本唯一编号 + Status int32 // 状态:0 登陆中 1 正常 2 离线 + USN int64 // 用户ID + SceneSID int64 // 场景服ID + InstanceID int32 // 副本ID,副本类型 + UniqueNo int64 // 副本唯一编号 } -func NewClient(usn string, conn socket.ISocketConn) *Client { +func NewClient(usn int64, conn socket.ISocketConn) *Client { client := &Client{ USN: usn, conn: conn, diff --git a/internal/handler/ws_handler/client/client_handler.go b/internal/handler/ws_handler/client/client_handler.go index 40d13d9..bb3c997 100644 --- a/internal/handler/ws_handler/client/client_handler.go +++ b/internal/handler/ws_handler/client/client_handler.go @@ -75,7 +75,7 @@ func (c *Client) onEnter(msg *ss_pb.C2S_EnterInstance) { } func (c *Client) onLeave() { - if c.SceneSID == "" { + if c.SceneSID == 0 { return } client, err := grpc_client.SceneNewClient(c.SceneSID) @@ -94,7 +94,7 @@ func (c *Client) onLeave() { } func (c *Client) onAction(msg *ss_pb.C2S_Action) { - if c.SceneSID == "" { + if c.SceneSID == 0 { return } if err := grpc_client.SendMessageToScene(c.SceneSID, grpc_client.FunAction, &grpc_pb.ActionReq{ diff --git a/internal/handler/ws_handler/client/manager.go b/internal/handler/ws_handler/client/manager.go index 3931e86..c46537c 100644 --- a/internal/handler/ws_handler/client/manager.go +++ b/internal/handler/ws_handler/client/manager.go @@ -8,35 +8,35 @@ import ( var UserMgr *userManager type userManager struct { - userMap map[string]*Client + userMap map[int64]*Client sync.RWMutex } func init() { UserMgr = &userManager{ - userMap: make(map[string]*Client), + userMap: make(map[int64]*Client), } } -func (m *userManager) Add(usn string, client *Client) { +func (m *userManager) Add(usn int64, client *Client) { m.Lock() defer m.Unlock() m.userMap[usn] = client global.OnlineUsersGauge.Inc() } -func (m *userManager) Delete(usn string) { +func (m *userManager) Delete(usn int64) { m.Lock() defer m.Unlock() delete(m.userMap, usn) global.OnlineUsersGauge.Dec() } -func (m *userManager) GetAll() map[string]*Client { +func (m *userManager) GetAll() map[int64]*Client { m.RLock() defer m.RUnlock() - copyMap := make(map[string]*Client, len(m.userMap)) + copyMap := make(map[int64]*Client, len(m.userMap)) for k, v := range m.userMap { copyMap[k] = v } @@ -54,7 +54,7 @@ func (m *userManager) GetAllInterface() []interface{} { return r } -func (m *userManager) GetByUSN(usn string) *Client { +func (m *userManager) GetByUSN(usn int64) *Client { m.RLock() defer m.RUnlock() return m.userMap[usn] diff --git a/internal/handler/ws_handler/login/login.go b/internal/handler/ws_handler/login/login.go index 466f338..fd9d554 100644 --- a/internal/handler/ws_handler/login/login.go +++ b/internal/handler/ws_handler/login/login.go @@ -161,7 +161,7 @@ func (l *Login) CheckOnline(user *User) string { } // KickUser 把玩家踢下线 -func (l *Login) KickUser(gatewaySID string, usn string) bool { +func (l *Login) KickUser(gatewaySID int64, usn int64) bool { gc, err := grpc_client.GatewayNewClient(gatewaySID) if err != nil { log.Errorf("KickUser cannot find gateway client: %v, sid: %v", err, gatewaySID) diff --git a/internal/handler/ws_handler/login/queue_up.go b/internal/handler/ws_handler/login/queue_up.go index eab2a88..e715ad1 100644 --- a/internal/handler/ws_handler/login/queue_up.go +++ b/internal/handler/ws_handler/login/queue_up.go @@ -78,7 +78,7 @@ func (q *QueueUp) Dequeue() (*client.Client, error) { } // GetPosition 返回用户前面还有多少人在排队 -func (q *QueueUp) GetPosition(usn string) (int64, bool) { +func (q *QueueUp) GetPosition(usn int64) (int64, bool) { val, ok := q.waiting.Load(usn) if !ok { return 0, false @@ -88,7 +88,7 @@ func (q *QueueUp) GetPosition(usn string) (int64, bool) { } // RemoveUser 安全移除用户(标记为取消) -func (q *QueueUp) RemoveUser(usn string) bool { +func (q *QueueUp) RemoveUser(usn int64) bool { _, loaded := q.waiting.LoadAndDelete(usn) return loaded } diff --git a/internal/net/http_gateway/middleward.go b/internal/net/http_gateway/middleward.go index a709685..e0376f0 100644 --- a/internal/net/http_gateway/middleward.go +++ b/internal/net/http_gateway/middleward.go @@ -71,7 +71,7 @@ func authJwt() gin.HandlerFunc { } // 这里将Header写到请求中,grpc-gateway框架会读取然后传给grpc服务 - c.Request.Header.Set("X-Usn", claims.USN) + c.Request.Header.Set("X-Usn", utils.Int64ToString(claims.USN)) // 这里写到上下文中,打日志 c.Set("usn", claims.USN) c.Next() diff --git a/internal/net/ws_gateway/server.go b/internal/net/ws_gateway/server.go index b69189f..774c4d6 100644 --- a/internal/net/ws_gateway/server.go +++ b/internal/net/ws_gateway/server.go @@ -44,7 +44,7 @@ func (g *GatewayWsServer) OnHandShake(conn socket.ISocketConn) socket.Action { func (g *GatewayWsServer) OnMessage(conn socket.ISocketConn, bytes []byte) socket.Action { cli, ok := conn.GetParam("client").(*client.Client) - if !ok || cli.USN == "" || cli.Status != 1 { + if !ok || cli.USN == 0 || cli.Status != 1 { return socket.Close } cli.OnEvent(&client.ClientEvent{Msg: bytes}) @@ -53,7 +53,7 @@ func (g *GatewayWsServer) OnMessage(conn socket.ISocketConn, bytes []byte) socke func (g *GatewayWsServer) OnPong(conn socket.ISocketConn) { cli, ok := conn.GetParam("client").(*client.Client) - if !ok || cli.USN == "" { + if !ok || cli.USN == 0 { return } cli.OnEvent(&client.PongEvent{})