重构

common/socket/Server.go

@@ -1 +0,0 @@
-package socket

common/socket/ServerEvent.go

@@ -6,9 +6,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"blazing/common/data/entity"
 	"blazing/common/data/share"
-	"blazing/cool"
+	"blazing/common/data/socket"
 
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/panjf2000/gnet/v2"
@@ -42,17 +41,17 @@ 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().(*entity.ClientData)
+	v, ok := c.Context().(*socket.ClientData)
 	if !ok {
 		return
 
 	}
 	t := v.GetPlayer()
-	if t != nil {
-		glog.Debug(context.Background(), t.UserID, "断开连接")
+	if v != nil {
+		glog.Debug(context.Background(), t, "断开连接")
 		t.IsLogin = false
-		cool.Mainplayer.Delete(t.UserID)
-		share.ShareManager.DeleteUserOnline(t.UserID) //设置用户登录服务器
+		socket.Mainplayer.Delete(t.Info.UserID)
+		share.ShareManager.DeleteUserOnline(t.Info.UserID) //设置用户登录服务器
 	}
 
 	//}
@@ -73,7 +72,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(entity.NewClientData()) //注入data
+		conn.SetContext(socket.NewClientData()) //注入data
 	}
 
 	atomic.AddInt64(&s.connected, 1)
@@ -86,7 +85,7 @@ func (s *Server) OnTraffic(c gnet.Conn) (action gnet.Action) {
 		return gnet.Close
 	}
 
-	ws := c.Context().(*entity.ClientData).Getwsmsg()
+	ws := c.Context().(*socket.ClientData).Getwsmsg()
 	tt, len1 := ws.ReadBufferBytes(c)
 	if tt == gnet.Close {
 
@@ -165,7 +164,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().(*entity.ClientData)
+	clientdata := c.Context().(*socket.ClientData)
 	if clientdata.GetIsCrossDomain() {
 		return
 

common/socket/handler/SocketHandler_Tomee.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"blazing/common/data/entity"
+	"blazing/common/data/socket"
 	"blazing/common/utils/bytearray"
 
 	"bytes"
@@ -37,7 +37,7 @@ func NewTomeeHeader(cmd uint32, userid uint32) *TomeeHeader {
 }
 
 type TomeeHandler struct {
-	Callback func(conn *entity.Conn, data TomeeHeader)
+	Callback func(conn *socket.Conn, data TomeeHeader)
 }
 
 func NewTomeeHandler() *TomeeHandler {
@@ -60,7 +60,7 @@ func (h *TomeeHandler) Handle(c gnet.Conn, data []byte) { //处理接收到的
 	header.Result, _ = tempdata.ReadUInt32()
 	header.Data = tempdata.BytesAvailable()
 	//fmt.Println("接收封包", header)
-	h.Callback(entity.NewConn(c), header)
+	h.Callback(socket.NewConn(c), header)
 	//return header
 }