From 8f67c7f55b358c3c388ba1694ac5f2abee4fd78f Mon Sep 17 00:00:00 2001
From: 575560454 <575560454@qq.com>
Date: Tue, 15 Jul 2025 14:00:32 +0000
Subject: [PATCH] =?UTF-8?q?"refactor(controller):=20=E7=BB=9F=E4=B8=80RPC?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?uint16/uint32=EF=BC=8C=E4=BF=AE=E6=AD=A3=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/controller.go   | 4 ++--
 logic/controller/login.go        | 2 +-
 logic/server.go                  | 2 +-
 modules/blazing/service/login.go | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/logic/controller/controller.go b/logic/controller/controller.go
index f34c3bdaf..470472d0c 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 ff4b99692..a7f39aa74 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 d718ea2be..a788682e8 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 2b6758d15..f1100cfe7 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)