diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go index daafc3d9..4a8b64ba 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 7653e798..3276b2ec 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 c524ad7f..eb74437f 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)) }