diff --git a/logic/controller/controller.go b/logic/controller/controller.go index f34c3bda..470472d0 100644 --- a/logic/controller/controller.go +++ b/logic/controller/controller.go @@ -24,9 +24,9 @@ var Maincontroller = NewController() //注入service type Controller struct { Port uint16 RPCClient struct { - Kick func(int32) error + Kick func(uint32) error - RegisterLogic func(int32) error + RegisterLogic func(uint16) error } } diff --git a/logic/controller/login.go b/logic/controller/login.go index ff4b9969..a7f39aa7 100644 --- a/logic/controller/login.go +++ b/logic/controller/login.go @@ -14,7 +14,7 @@ import ( func (h *Controller) Login(data login.LoginSidInfo, c gnet.Conn) []byte { //这个时候player应该是空的 if tt := data.CheakSession(); tt { //说明sid正确 - h.RPCClient.Kick(int32(data.Head.UserID)) //先踢人 + h.RPCClient.Kick(data.Head.UserID) //先踢人 // h.RPCClient.UserLogin(int32(h.Port), int32(data.Head.UserID)) //初始化用户登录 service.SetPlayer(c, data.Head.UserID) diff --git a/logic/server.go b/logic/server.go index d718ea2b..a788682e 100644 --- a/logic/server.go +++ b/logic/server.go @@ -75,7 +75,7 @@ func Start(serverid uint32) { t := rpc.StartClient(uint16(port), controller.Maincontroller) //TODO 待实现掉线重新连接login controller.Maincontroller.RPCClient = *t //将RPC赋值Start - controller.Maincontroller.Port = serverid //赋值服务器ID + controller.Maincontroller.Port = uint16(port) //赋值服务器ID //}() //go rpc.StartClient(uint16(serverid), &controller.Maincontroller) diff --git a/modules/blazing/service/login.go b/modules/blazing/service/login.go index 2b6758d1..f1100cfe 100644 --- a/modules/blazing/service/login.go +++ b/modules/blazing/service/login.go @@ -51,9 +51,9 @@ func (s *LoginService) GetSessionId(accountID uint) (string, string, error) { // 以上过程只需全局一次,且应在生成ID之前完成。 } func (s *LoginService) SetServerID(OnlineID uint32, Port uint16, t *struct { - Kick func(int32) error + Kick func(uint32) error - RegisterLogic func(int32) error + RegisterLogic func(uint16) error }) error { m := cool.DBM(s.Model).Where("online_id", OnlineID)