"refactor(controller): 统一RPC方法参数类型为uint16/uint32,修正端口赋值逻辑"
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user