refactor(socket): 重构 socket 模块

- 移除 common/data/socket 目录下的大部分文件
- 新增 service 目录,将 Player 和 Conn 结构体移至该目录
- 更新 LogicClient 中的方法签名,使用 service 包的类型
- 重构 Controller 中的方法,适应新的 service 包结构
This commit is contained in:
2025-09-04 02:00:57 +08:00
parent afdf015d62
commit 621a9d3858
50 changed files with 886 additions and 849 deletions

View File

@@ -7,7 +7,8 @@ import (
"time"
"blazing/common/data/share"
"blazing/common/data/socket"
"blazing/logic/service"
"blazing/logic/service/maps"
"github.com/gogf/gf/v2/os/glog"
@@ -42,7 +43,7 @@ func (s *Server) Stop() error {
func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) {
atomic.AddInt64(&s.connected, -1)
//logging.Infof("conn[%v] disconnected", c.RemoteAddr().String())
v, ok := c.Context().(*socket.ClientData)
v, ok := c.Context().(*service.ClientData)
if !ok {
return
@@ -54,7 +55,7 @@ func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) {
maps.LeaveMap(v.Player)
v.Player.IsLogin = false
socket.Mainplayer.Delete(v.Player.Info.UserID)
service.Mainplayer.Delete(v.Player.Info.UserID)
share.ShareManager.DeleteUserOnline(v.Player.Info.UserID) //设置用户登录服务器
v.Player.Save() //保存玩家数据
}
@@ -77,7 +78,7 @@ func (s *Server) OnBoot(eng gnet.Engine) gnet.Action {
func (s *Server) OnOpen(conn gnet.Conn) (out []byte, action gnet.Action) {
if conn.Context() == nil {
conn.SetContext(socket.NewClientData()) //注入data
conn.SetContext(service.NewClientData()) //注入data
}
atomic.AddInt64(&s.connected, 1)
@@ -90,7 +91,7 @@ func (s *Server) OnTraffic(c gnet.Conn) (action gnet.Action) {
return gnet.Close
}
ws := c.Context().(*socket.ClientData).Wsmsg
ws := c.Context().(*service.ClientData).Wsmsg
tt, len1 := ws.ReadBufferBytes(c)
if tt == gnet.Close {
@@ -169,7 +170,7 @@ const CROSS_DOMAIN = "<?xml version=\"1.0\"?><!DOCTYPE cross-domain-policy><cros
const TEXT = "<policy-file-request/>\x00"
func handle(c gnet.Conn) {
clientdata := c.Context().(*socket.ClientData)
clientdata := c.Context().(*service.ClientData)
if clientdata.IsCrossDomain {
return