1

2025-06-24 22:09:05 +08:00
parent 32a7a512a2
commit fdac99f11c
38 changed files with 42980 additions and 180 deletions
--- a/common/contrib/drivers/mysql/go.mod
+++ b/common/contrib/drivers/mysql/go.mod
@@ -1,41 +1,41 @@
-module blazing/contrib/drivers/mysql
-
-go 1.18
-
-require (
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.3
-	github.com/gogf/gf/v2 v2.6.3
-	gorm.io/driver/mysql v1.5.4
-	gorm.io/gorm v1.25.7
-)
-
-require (
-	github.com/BurntSushi/toml v1.3.2 // indirect
-	github.com/clbanning/mxj/v2 v2.7.0 // indirect
-	github.com/fatih/color v1.16.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-sql-driver/mysql v1.7.1 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
-	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
-	go.opentelemetry.io/otel v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
+module blazing/contrib/drivers/mysql
+
+go 1.18
+
+require (
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.3
+	github.com/gogf/gf/v2 v2.6.3
+	gorm.io/driver/mysql v1.5.4
+	gorm.io/gorm v1.25.7
+)
+
+require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/clbanning/mxj/v2 v2.7.0 // indirect
+	github.com/fatih/color v1.16.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	go.opentelemetry.io/otel v1.14.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
--- a/common/core/info/login/CommendSvrInfo.go
+++ b/common/core/info/login/CommendSvrInfo.go
@@ -2,16 +2,19 @@ package login

 // CommendSvrInfo 初始连接请求信息结构体
 type CommendSvrInfo struct {
-	MaxOnlineID uint32       // 最大连接数
-	IsVip       uint32       // 建议为0
-	ServerList  []ServerInfo // 服务器具体信息
-	Reversed    uint32       // 保留字段
+	MaxOnlineID   uint32       // 最大连接数
+	IsVip         uint32       // 建议为0
+	ServerInfoLen uint32       `struc:"sizeof=ServerList"` // 服务器信息长度 ServerInfo
+	ServerList    []ServerInfo // 服务器具体信息
+	Reversed      uint32       // 保留字段
 }

 func NewCommendSvrInfo() *CommendSvrInfo {
 	return &CommendSvrInfo{
-		IsVip:      0,
-		ServerList: make([]ServerInfo, 0),
-		Reversed:   0,
+		MaxOnlineID:   100,
+		IsVip:         0,
+		ServerInfoLen: 0,
+		ServerList:    make([]ServerInfo, 0),
+		Reversed:      0,
 	}
 }
--- a/common/core/info/login/CommendSvrInfo_test.go
+++ b/common/core/info/login/CommendSvrInfo_test.go
@@ -0,0 +1,47 @@
+package login
+
+import (
+	"bytes"
+	"encoding/hex"
+	"fmt"
+	"testing"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/lunixbochs/struc"
+)
+
+func TestNewCommendSvrInfo(t *testing.T) {
+
+	ret := NewCommendSvrInfo()
+
+	lofin := NewServerInfo()
+	lofin.OnlineID = 1
+	lofin.UserCnt = 77
+	lofin.IP = "127.0.0.1"
+	lofin.Port = 27777
+	lofin.Friends = 1
+
+	ret.ServerList = append(ret.ServerList, *lofin)
+
+	// bytt := bytearray.CreateByteArray()
+	// bytt.WriteUInt32(100)
+	// bytt.WriteUInt32(0)
+
+	// //ret.ServerList = append(ret.ServerList, *lofin)
+	var trr bytes.Buffer
+	// err := struc.Pack(&trr, lofin)
+	// bytt.WriteUInt32(1) //长度
+	// bytt.Write(trr.Bytes())
+	// bytt.WriteUInt32(1)
+	// //err:=Println(trr.Bytes())
+	/// 00 00 00 64 00 00 00 00 00 00 00 01 00 00 00  01 00 00 00 4d 31 32 37 2e 30 2e 30 2e 31 00 00  00 00 00 00 00 6c 81 00 00 00 01 00 00 00 00
+
+	err := struc.Pack(&trr, ret)
+	fmt.Println(err)
+	fmt.Println(trr.Bytes())
+	g.Dump(ret)
+	fmt.Println("000000640000000000000001000000010000004d3132372e302e302e31000000000000006c810000000100000000")
+	fmt.Println("000000640000000000000001000000010000004d3132372e302e302e31000000000000006c810000000100000000")
+	fmt.Println(hex.EncodeToString(trr.Bytes()))
+
+}
--- a/common/data/entity/player.go
+++ b/common/data/entity/player.go
@@ -1,4 +1,58 @@
 package entity

+import (
+	"blazing/common/socket/cmd"
+	"blazing/common/socket/handler"
+	"bytes"
+
+	"github.com/lunixbochs/struc"
+	"github.com/panjf2000/gnet/v2"
+)
+
 type Player struct {
+	UserID uint32 //用户ID
+	Conn   gnet.Conn
+}
+
+// PlayerOption 定义配置 Player 的函数类型
+type PlayerOption func(*Player)
+
+// WithUserID 设置用户ID的选项函数
+func WithUserID(userID uint32) PlayerOption {
+	return func(p *Player) {
+		p.UserID = userID
+	}
+}
+func WithConn(Conn gnet.Conn) PlayerOption {
+	return func(p *Player) {
+		p.Conn = Conn
+	}
+}
+
+// NewPlayer 使用 Options 模式创建 Player 实例
+func NewPlayer(opts ...PlayerOption) *Player {
+	p := &Player{}
+	for _, opt := range opts {
+		opt(p)
+	}
+	return p
+}
+
+func (p *Player) GetUserID() uint32 {
+	return p.UserID
+}
+
+func (p *Player) SendPackBytes(cmd cmd.EnumCommandID, data []byte) { //组包
+
+	head1 := handler.TomeeHeader{}
+	head1.CMDID = uint32(cmd)
+	head1.Len = uint32(len(data) + 17)
+	head1.Version = "7"
+	head1.UserID = p.UserID
+	head1.Result = 0
+	var data1 bytes.Buffer
+	struc.Pack(&data1, head1)
+	p.Conn.Write(data1.Bytes()) //写入头部
+	p.Conn.Write(data)          //写入数据
+
 }
--- a/common/go.mod
+++ b/common/go.mod
@@ -9,6 +9,12 @@ require (
 	github.com/gogf/gf/v2 v2.6.3
 )

+require (
+	github.com/antchfx/xmlquery v1.4.4 // indirect
+	github.com/antchfx/xpath v1.3.3 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+)
+
 require (
 	github.com/BurntSushi/toml v1.2.0 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
@@ -34,10 +40,10 @@ require (
 	go.opentelemetry.io/otel/trace v1.14.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/common/go.sum
+++ b/common/go.sum
@@ -1,6 +1,10 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/antchfx/xmlquery v1.4.4 h1:mxMEkdYP3pjKSftxss4nUHfjBhnMk4imGoR96FRY2dg=
+github.com/antchfx/xmlquery v1.4.4/go.mod h1:AEPEEPYE9GnA2mj5Ur2L5Q5/2PycJ0N9Fusrx9b12fc=
+github.com/antchfx/xpath v1.3.3 h1:tmuPQa1Uye0Ym1Zn65vxPgfltWb/Lxu2jeqIGteJSRs=
+github.com/antchfx/xpath v1.3.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
 github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
@@ -19,7 +23,10 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.3/go.mod h1:2+evGu1xAlamaYuDdSqa7QCiwPTm1RrGsUFSMc8PyLc=
 github.com/gogf/gf/v2 v2.6.3 h1:DoqeuwU98wotpFoDSQEx8RZbmJdK8KdGiJtzJeqpyIo=
 github.com/gogf/gf/v2 v2.6.3/go.mod h1:x2XONYcI4hRQ/4gMNbWHmZrNzSEIg20s2NULbzom5k0=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
@@ -66,6 +73,7 @@ github.com/tnnmigga/enum v1.0.2/go.mod h1:QaBFBwGJi/2GAM34b2pz6UL2NRtl2TRZ8lXp4v
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
 go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
 go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
@@ -85,16 +93,41 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
 golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -102,20 +135,48 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211204120058-94396e421777/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/common/serialize/sturc/fields.go
+++ b/common/serialize/sturc/fields.go
@@ -97,6 +97,7 @@ func (f Fields) Pack(buf []byte, val reflect.Value, options *Options) (int, erro
 			return n, err
 		} else {
 			pos += n
+			//g.Dump(v)
 		}
 	}
 	return pos, nil
--- a/common/socket/ServerEvent.go
+++ b/common/socket/ServerEvent.go
@@ -2,6 +2,7 @@ package socket

 import (
 	"context"
+	"log"

 	"blazing/common/data/entity"

@@ -48,7 +49,9 @@ func (s *Server) OnTraffic(conn gnet.Conn) (action gnet.Action) {
 func (s *Server) handleTcp(conn gnet.Conn) (action gnet.Action) {

 	for {
-
+		if !s.discorse {
+			handle(conn)
+		}
 		data, err := s.codec.Decode(conn)
 		if err != nil {
 			break
@@ -56,7 +59,7 @@ func (s *Server) handleTcp(conn gnet.Conn) (action gnet.Action) {

 		//client := conn.RemoteAddr().String()
 		_ = s.workerPool.Submit(func() {
-			s.parser(data)
+			s.parser(conn, data)
 		})

 		return gnet.None
@@ -73,12 +76,44 @@ func (s *Server) handleTcp(conn gnet.Conn) (action gnet.Action) {

 }

-func (s *Server) parser(line []byte) {
+func (s *Server) parser(c gnet.Conn, line []byte) {
 	//todo 这里待实现注入player实体
-	s.handler.Handle(line)
+	s.handler.Handle(c, line)
 }
 func (s *Server) Start() {

 	err := gnet.Run(s, s.network+"://"+s.addr, gnet.WithMulticore(s.multicore))
 	logging.Infof("server exits with error: %v", err)
 }
+
+// CROSS_DOMAIN 定义跨域策略文件内容
+const CROSS_DOMAIN = "<?xml version=\"1.0\"?><!DOCTYPE cross-domain-policy><cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\x00"
+
+// TEXT 定义跨域请求的文本格式
+const TEXT = "<policy-file-request/>\x00"
+
+func handle(c gnet.Conn) {
+	clientdata := c.Context().(*entity.ClientData)
+	if clientdata.IsCrossDomain {
+		return
+
+	}
+	// 读取数据并检查是否为跨域请求
+	data, err := c.Peek(len(TEXT))
+	if err != nil {
+		log.Printf("Error reading cross-domain request: %v", err)
+		return
+	}
+
+	if string(data) == TEXT { //判断是否是跨域请求
+		log.Printf("Received cross-domain request from %s", c.RemoteAddr())
+		// 处理跨域请求
+		c.Write([]byte(CROSS_DOMAIN))
+		c.Discard(len(TEXT))
+
+		clientdata.IsCrossDomain = true
+		return
+	}
+
+	//return
+}
--- a/common/socket/ServerOption.go
+++ b/common/socket/ServerOption.go
@@ -18,6 +18,7 @@ type Server struct {
 	workerPool *goroutine.Pool
 	codec      codec.SocketCodec
 	handler    handler.Handler
+	discorse   bool
 }

 type Option func(*Server)
@@ -31,6 +32,7 @@ func NewServer(options ...Option) *Server {
 		workerPool: goroutine.Default(),
 		bufferSize: 4096, //默认缓冲区大小
 		multicore:  true,
+		discorse:   true,
 	}
 	for _, option := range options {
 		option(server)
@@ -43,7 +45,11 @@ func WithSocketCodec(codec codec.SocketCodec) Option {
 		u.codec = codec
 	}
 }
-
+func WithCORS() Option {
+	return func(u *Server) {
+		u.discorse = false
+	}
+}
 func WithSocketHandler(handler handler.Handler) Option {
 	return func(u *Server) {
 		u.handler = handler
--- a/common/socket/codec/SocketCodec_Tomee.go
+++ b/common/socket/codec/SocketCodec_Tomee.go
@@ -1,21 +1,13 @@
 package codec

 import (
-	"blazing/common/data/entity"
 	"encoding/binary"
 	"errors"
 	"io"
-	"log"

 	"github.com/panjf2000/gnet/v2"
 )

-// CROSS_DOMAIN 定义跨域策略文件内容
-const CROSS_DOMAIN = "<?xml version=\"1.0\"?><!DOCTYPE cross-domain-policy><cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\x00"
-
-// TEXT 定义跨域请求的文本格式
-const TEXT = "<policy-file-request/>\x00"
-
 var ErrIncompletePacket = errors.New("incomplete packet")

 // TomeeSocketCodec 协议格式:
@@ -39,31 +31,6 @@ func NewTomeeSocketCodec() *TomeeSocketCodec {

 }

-func handle(c gnet.Conn) {
-	clientdata := c.Context().(*entity.ClientData)
-	if clientdata.IsCrossDomain {
-		return
-
-	}
-	// 读取数据并检查是否为跨域请求
-	data, err := c.Peek(len(TEXT))
-	if err != nil {
-		log.Printf("Error reading cross-domain request: %v", err)
-		return
-	}
-
-	if string(data) == TEXT { //判断是否是跨域请求
-		log.Printf("Received cross-domain request from %s", c.RemoteAddr())
-		// 处理跨域请求
-		c.Write([]byte(CROSS_DOMAIN))
-		c.Discard(len(TEXT))
-
-		clientdata.IsCrossDomain = true
-		return
-	}
-
-	//return
-}
 func (codec TomeeSocketCodec) Encode(buf []byte) ([]byte, error) {
 	bodyLen := len(buf)
 	data := make([]byte, 4+bodyLen)
@@ -78,7 +45,7 @@ func (codec TomeeSocketCodec) Encode(buf []byte) ([]byte, error) {

 func (codec TomeeSocketCodec) Decode(c gnet.Conn) ([]byte, error) {

-	handle(c)
+	//	handle(c)
 	// 先读取4字节的包长度
 	lenBuf, err := c.Peek(4)
 	if err != nil {
--- a/common/socket/handler/SocketHandler.go
+++ b/common/socket/handler/SocketHandler.go
@@ -1,6 +1,8 @@
 package handler

+import "github.com/panjf2000/gnet/v2"
+
 // Handler The handler receive every syslog entry at Handle method
 type Handler interface {
-	Handle([]byte)
+	Handle(gnet.Conn, []byte)
 }
--- a/common/socket/handler/SocketHandler_Tomee.go
+++ b/common/socket/handler/SocketHandler_Tomee.go
@@ -2,20 +2,23 @@ package handler

 import (
 	"blazing/common/serialize/bytearray"
+
+	"github.com/panjf2000/gnet/v2"
 )

 // TomeeHeader 结构体字段定义
 type TomeeHeader struct {
 	Len     uint32 `json:"len"`
 	Version string `json:"version"`
-	UserID  uint32 `json:"userId"`
-	Error   uint32 `json:"error"`
 	CMDID   uint32 `json:"cmdId"`
-	Result  uint32 `json:"result"`
-	Data    []byte `json:"data"`
+	UserID  uint32 `json:"userId"`
+	//Error   uint32 `json:"error" struc:"[0]pad"`
+
+	Result uint32 `json:"result"`
+	Data   []byte `json:"data" struc:"[0]pad"` //组包忽略此字段
 }
 type TomeeHandler struct {
-	Callback func(data TomeeHeader)
+	Callback func(conn gnet.Conn, data TomeeHeader)
 }

 func NewTomeeHandler() *TomeeHandler {
@@ -23,7 +26,7 @@ func NewTomeeHandler() *TomeeHandler {
 }

 // Handle entry receiver
-func (h *TomeeHandler) Handle(data []byte) { //处理接收到的数据 ,
+func (h *TomeeHandler) Handle(c gnet.Conn, data []byte) { //处理接收到的数据 ,
 	//fmt.Println("接收数据", data)

 	header := TomeeHeader{}
@@ -37,6 +40,6 @@ func (h *TomeeHandler) Handle(data []byte) { //处理接收到的数据 ,
 	header.Result, _ = tempdata.ReadUInt32()
 	header.Data = tempdata.BytesAvailable()
 	//fmt.Println("接收封包", header)
-	h.Callback(header)
+	h.Callback(c, header)
 	//return header
 }