refactor(entity): 重构 ClientData 结构体并添加同步锁

- 在 ClientData 中添加 sync.Mutex 以确保并发安全
- 实现 SetPlayer 和 GetPlayer 等方法来封装 player 字段的操作
- 更新相关代码以使用新的 ClientData 结构和方法

common/data/entity/Client.go

@@ -1,15 +1,41 @@
 package entity
 
+import "sync"
+
 type ClientData struct {
-	IsCrossDomain bool    //是否跨域过
-	Player        *Player //客户实体
+	isCrossDomain bool    //是否跨域过
+	player        *Player //客户实体
+	//UserID        uint32
+	m sync.Mutex
+}
+
+func (cd *ClientData) SetPlayer(player *Player) {
+	cd.m.Lock()
+	defer cd.m.Unlock()
+	cd.player = player
+}
+func (cd *ClientData) GetPlayer() *Player {
+	cd.m.Lock()
+	defer cd.m.Unlock()
+	return cd.player
+}
+func (cd *ClientData) SetCrossDomain(isCrossDomain bool) {
+	cd.m.Lock()
+	defer cd.m.Unlock()
+	cd.isCrossDomain = isCrossDomain
+}
+func (cd *ClientData) GetIsCrossDomain() bool {
+	cd.m.Lock()
+	defer cd.m.Unlock()
+	return cd.isCrossDomain
 }
 
 func NewClientData() *ClientData {
-	cd := &ClientData{
-		IsCrossDomain: false,
-		Player:        nil,
+	cd := ClientData{
+		isCrossDomain: false,
+		player:        nil,
+		m:             sync.Mutex{},
 	}
-	return cd
+	return &cd
 
 }

common/data/entity/player.go

@@ -1,6 +1,8 @@
 package entity
 
 import (
+	"blazing/common/core"
+
 	"github.com/panjf2000/gnet/v2"
 )
 
@@ -43,3 +45,16 @@ func (p *Player) SendPack(b []byte) error {
 	_, err := p.MainConn.Write(b)
 	return err
 }
+
+func ConutPlayer() int {
+
+	// v := reflect.ValueOf(&core.Mainplayer).Elem().FieldByName("m").Elem()
+	// return int(v.FieldByName("count").Int())
+	count := 0
+	core.Mainplayer.Range(func(key, value interface{}) bool {
+		count++
+		return true // 继续遍历
+	})
+	return count
+	//fmt.Println("元素数量:", count) // 输出: 3
+}

common/rpc/rpc.go

@@ -17,6 +17,7 @@ var usermap = make(map[int]int)              //用户->客户端的map
 // Define the client handler interface
 type ClientHandler struct {
 	KickPerson func(int) error //踢人,这里是返回具体的logic
+	QuitSelf   func(int) error //关闭服务器进程
 }
 
 // Define the server handler
@@ -43,18 +44,30 @@ func (h *ServerHandler) Kick(ctx context.Context, userid int) error {
 }
 
 // 退出指定服务器
-func (h *ServerHandler) Quit(ctx context.Context, userid int) error {
+// func (h *ServerHandler) Quit(ctx context.Context, portid int) error {
 
-	return nil
+// 	a, ok := clientmap[portid]
 
-}
+// 	if ok && a != nil {
+// 		a.QuitSelf(0)
+// 	}
+// 	//clientmap[portid].QuitSelf(0)
+// 	return nil
+
+// }
 
 // 注册logic服务器
 func (h *ServerHandler) RegisterLogic(ctx context.Context, port int) error {
+	//TODO 待修复滚动更新可能导致的玩家可以同时在旧服务器和新服务器同时在线的bug
 	revClient, ok := jsonrpc.ExtractReverseClient[ClientHandler](ctx)
 	if !ok {
 		return fmt.Errorf("no reverse client")
 	}
+
+	aa, ok := clientmap[port]
+	if ok && aa != nil {
+		aa.QuitSelf(0)
+	}
 	clientmap[port] = &revClient
 	return nil
 
@@ -92,8 +105,8 @@ func StartServer() {
 var closer jsonrpc.ClientCloser
 
 func StartClient(port uint16, callback any) *struct {
-	Kick          func(int32) error
-	Quit          func(int32) error
+	Kick func(int32) error
+
 	RegisterLogic func(int32) error
 	UserLogin     func(int32, int32) error
 	UserLogout    func(int32, int32) error
@@ -124,8 +137,8 @@ func CloseClient() {
 
 // Setup RPCClient with reverse call handler
 var RPCClient struct {
-	Kick          func(int32) error //踢人
-	Quit          func(int32) error //退出指定服务器
+	Kick func(int32) error //踢人
+
 	RegisterLogic func(int32) error //注册服务器消息
 
 	UserLogin  func(int32, int32) error //用户登录事件

common/socket/ServerEvent.go

@@ -2,10 +2,12 @@ package socket
 
 import (
 	"context"
+	"fmt"
 	"log"
 
 	"blazing/common/data/entity"
 
+	"github.com/gogf/gf/v2/os/glog"
 	"github.com/panjf2000/gnet/v2"
 	"github.com/panjf2000/gnet/v2/pkg/logging"
 )
@@ -30,7 +32,17 @@ func (s *Server) Stop() error {
 
 func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) {
 	//fmt.Println(glog.GetStack(), c.Context().(*entity.ClientData).Player.UserID, "断开连接")
+	//fmt.Println("远程地址", c.RemoteAddr(), c)
+	fmt.Printf("关闭函数地址: %p\n", c.Context()) // 输出类似: 0x1040a1390
+	//if c.Context() != nil {
+	v := c.Context().(*entity.ClientData)
+	t := v.GetPlayer()
+	if t != nil {
+		glog.Debug(context.Background(), t.UserID, "断开连接")
 
+	}
+
+	//}
 	//关闭连接
 	return
 }
@@ -43,8 +55,10 @@ func (s *Server) OnBoot(eng gnet.Engine) gnet.Action {
 }
 
 func (s *Server) OnTraffic(conn gnet.Conn) (action gnet.Action) {
+	if conn.Context() == nil {
+		conn.SetContext(entity.NewClientData()) //注入data
+	}
 
-	conn.SetContext(entity.NewClientData()) //注入data
 	if s.network == "tcp" {
 		return s.handleTcp(conn)
 	}
@@ -100,7 +114,7 @@ const TEXT = "<policy-file-request/>\x00"
 
 func handle(c gnet.Conn) {
 	clientdata := c.Context().(*entity.ClientData)
-	if clientdata.IsCrossDomain {
+	if clientdata.GetIsCrossDomain() {
 		return
 
 	}
@@ -117,7 +131,7 @@ func handle(c gnet.Conn) {
 		c.Write([]byte(CROSS_DOMAIN))
 		c.Discard(len(TEXT))
 
-		clientdata.IsCrossDomain = true //TODO 待修复未成功切换bug
+		clientdata.SetCrossDomain(true) //= true //TODO 待修复未成功切换bug
 		return
 	}