From 0c3f56d7bb5a4fd414e6659838f4b0621540fe4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?=
 <12574910+72wo@users.noreply.github.com>
Date: Sat, 7 Feb 2026 02:59:38 +0800
Subject: [PATCH] 1

---
 common/socket/ServerEvent.go  | 5 ++++-
 common/socket/ServerOption.go | 2 ++
 logic/server.go               | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go
index daafc3d98..4a8b64bab 100644
--- a/common/socket/ServerEvent.go
+++ b/common/socket/ServerEvent.go
@@ -11,14 +11,16 @@ import (
 	"blazing/common/socket/codec"
 	"blazing/cool"
 	"blazing/logic/service/player"
+	"blazing/modules/config/service"
 
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/panjf2000/gnet/v2"
 )
 
-func (s *Server) Boot() error {
+func (s *Server) Boot(serverid, port uint16) error {
 	//	go s.bootws()
+
 	err := gnet.Run(s, s.network+"://"+s.addr,
 		gnet.WithMulticore(true),
 		gnet.WithTicker(true),
@@ -84,6 +86,7 @@ func (s *Server) OnTick() (delay time.Duration, action gnet.Action) {
 func (s *Server) OnBoot(eng gnet.Engine) gnet.Action {
 	s.eng = eng
 
+	service.NewServerService().SetServerID(s.serverid, s.port) //设置当前服务器端口
 	return gnet.None
 }
 
diff --git a/common/socket/ServerOption.go b/common/socket/ServerOption.go
index 7653e798b..3276b2ec4 100644
--- a/common/socket/ServerOption.go
+++ b/common/socket/ServerOption.go
@@ -25,6 +25,8 @@ type Server struct {
 	discorse   bool
 	quit       bool
 	batchRead  int
+	serverid   uint16
+	port       uint16
 }
 
 type Option func(*Server)
diff --git a/logic/server.go b/logic/server.go
index c524ad7fb..eb74437fc 100644
--- a/logic/server.go
+++ b/logic/server.go
@@ -82,7 +82,6 @@ func Start() {
 	controller.Maincontroller.Port = uint16(port)    //赋值服务器ID
 	controller.Init(true)
 	xmlres.Initfile()
-	config.NewServerService().SetServerID(serverID, gconv.Uint16(port)) //设置当前服务器端口
 
-	server.Boot()
+	server.Boot(serverID, gconv.Uint16(port))
 }