From 76fa896ab44684fb97878d5329e48af76df09f83 Mon Sep 17 00:00:00 2001
From: liuxiaobo <1224730913@qq.com>
Date: Sun, 22 Jun 2025 17:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=B8=90?=
 =?UTF-8?q?=E5=8F=B7=E4=BF=A1=E6=81=AF=E7=9A=84rpc=EF=BC=8Cadmin=E6=9F=A5?=
 =?UTF-8?q?=E6=89=BE=E7=8E=A9=E5=AE=B6=E4=BF=A1=E6=81=AF=E6=97=B6=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=B8=90=E5=8F=B7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/server/api/v1/gameUser/user.go  | 24 ++++++++++++++++++++++++
 admin/server/router/gameUser/user.go  |  3 ++-
 admin/web/src/api/gameUser.js         |  8 ++++++++
 admin/web/src/view/gameuser/index.vue | 18 +++++++++++-------
 common/rpc/rpcGameUser.go             | 19 +++++++++++++++++++
 common/rpc/rpcName.go                 |  9 +++++----
 server/db/operation/userAccount.go    |  9 +++++++++
 server/db/server/handlerUser.go       |  7 +++++++
 server/db/server/processor.go         |  1 +
 9 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/admin/server/api/v1/gameUser/user.go b/admin/server/api/v1/gameUser/user.go
index c81dc6c..2ade078 100644
--- a/admin/server/api/v1/gameUser/user.go
+++ b/admin/server/api/v1/gameUser/user.go
@@ -4,9 +4,11 @@ import (
 	"fmt"
 	"game/common/model/user"
 	"game/common/proto/pb"
+	"game/common/rpc"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	us "github.com/flipped-aurora/gin-vue-admin/server/service/user"
+	"github.com/flipped-aurora/gin-vue-admin/server/servicex"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
@@ -34,3 +36,25 @@ func (e *GameUserApi) GetUserById(c *gin.Context) {
 	}
 	response.OkWithData(gin.H{"user": gameUser}, c)
 }
+
+func (e *GameUserApi) GetAccountByUid(c *gin.Context) {
+	var account = &user.UserAccount{}
+	err := c.ShouldBindJSON(&account)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if account.ID < 1 {
+		response.FailWithMessage(fmt.Sprintf("玩家帐号id不能为0"), c)
+		return
+	}
+
+	var code pb.ErrCode
+	account, code = rpc.RpcGetAccountByUid(servicex.GetService(), account.ID)
+	if code != pb.ErrCode_OK {
+		global.GVA_LOG.Error("查询失败!", zap.Error(fmt.Errorf(code.String())))
+		response.FailWithMessage("查询失败", c)
+		return
+	}
+	response.OkWithData(gin.H{"account": account}, c)
+}
diff --git a/admin/server/router/gameUser/user.go b/admin/server/router/gameUser/user.go
index 6138227..ab7d74f 100644
--- a/admin/server/router/gameUser/user.go
+++ b/admin/server/router/gameUser/user.go
@@ -12,7 +12,8 @@ func (s *GameUserRouter) InitGameUserRouter(Router *gin.RouterGroup, RouterPub *
 	router := Router.Group("gameUser").Use(middleware.OperationRecord())
 
 	{
-		router.PUT("getUserById", gameUserApi.GetUserById) // 获取玩家信息
+		router.PUT("getUserById", gameUserApi.GetUserById)         // 获取玩家信息
+		router.PUT("getAccountByUid", gameUserApi.GetAccountByUid) // 获取玩家帐号信息
 	}
 
 }
diff --git a/admin/web/src/api/gameUser.js b/admin/web/src/api/gameUser.js
index a0e6bad..5de8af4 100644
--- a/admin/web/src/api/gameUser.js
+++ b/admin/web/src/api/gameUser.js
@@ -8,4 +8,12 @@ export function getUserById(params) {
     method: 'put',
     data: params
   })
+}
+
+export function getAccountByUid(params) {
+  return request({
+    url: '/gameUser/getAccountByUid',
+    method: 'put',
+    data: params
+  })
 }
\ No newline at end of file
diff --git a/admin/web/src/view/gameuser/index.vue b/admin/web/src/view/gameuser/index.vue
index 28ed655..f6d0f48 100644
--- a/admin/web/src/view/gameuser/index.vue
+++ b/admin/web/src/view/gameuser/index.vue
@@ -39,7 +39,10 @@
 
 
 <script>
-import {getUserById} from "@/api/gameUser";
+import {
+  getUserById,
+  getAccountByUid,
+} from "@/api/gameUser";
 
 export default {
   name: 'UserManagement',
@@ -50,9 +53,9 @@ export default {
         nickname: '',
       },
       statusMap : {
-        0: '正常',
-        1: '禁用',
-        2:'白名单',
+        1: '正常',
+        2: '禁用',
+        3:'白名单',
       },
       userList: [
         // {
@@ -109,18 +112,19 @@ export default {
         const id = this.searchInfo.id // 或者从其他地方获取ID
         if (id) {
           const response = await getUserById({id:+id})
-          if (response.code !== 0) {
+          if (response.code !== 0 || response.data.user.account_id === 0) {
             console.error('获取玩家数据失败:', response.msg || `请求失败，错误码: ${response.code}`)
             this.$message.error('获取用户数据失败:'+(response.msg || `请求失败，错误码: ${response.code}`))
             return
           }
-          console.error('获取玩家数据:', response.data.user)
+          const retAccount = await getAccountByUid({id:+response.data.user.account_id})
+          console.error('获取玩家帐号数据:', retAccount)
           this.userList = [
             {
               id:response.data.user.id,
               nickname:response.data.user.nickname,
               gold:response.data.user.gold,
-              status:response.data.user.status,
+              status:retAccount.data.account.status,
             },
           ]
         } else {
diff --git a/common/rpc/rpcGameUser.go b/common/rpc/rpcGameUser.go
index b423911..6a5804c 100644
--- a/common/rpc/rpcGameUser.go
+++ b/common/rpc/rpcGameUser.go
@@ -37,3 +37,22 @@ func RpcGetGameUser(s service.IService, uid int64) (*user.GameUser, pb.ErrCode)
 	}
 	return nil, pb.ErrCode(rspMsg.RpcCode)
 }
+
+// 获取玩家数据
+func RpcGetAccountByUid(s service.IService, uid int64) (*user.UserAccount, pb.ErrCode) {
+	us := &user.UserAccount{
+		ID: uid,
+	}
+	rpcMsg := ipb.MakeRpcMsg(GetUserAccountById, uid, us)
+	log.DebugF("%v call rpc:%v", s.Name(), GetUserAccountById)
+	rspMsg, err := s.CallByServiceId(int(pb.ServiceTypeId_STI_DB), timeout, rpcMsg)
+	if err != nil {
+		log.ErrorF("call rpc:%v err:%s ", rpcMsg.RpcMsgId, err.Error())
+		return nil, pb.ErrCode_SystemErr
+	}
+	if rspMsg.RpcCode == 0 {
+		_ = json.Unmarshal(rspMsg.Msg, us)
+		return us, pb.ErrCode_OK
+	}
+	return nil, pb.ErrCode(rspMsg.RpcCode)
+}
diff --git a/common/rpc/rpcName.go b/common/rpc/rpcName.go
index 0c62a36..3e283ec 100644
--- a/common/rpc/rpcName.go
+++ b/common/rpc/rpcName.go
@@ -2,10 +2,11 @@ package rpc
 
 const (
 	// 用户、用户资源及帐号相关操作
-	GetUserAccount      = "get.user.account.rpc"
-	CreateUserAccount   = "create.user.account.rpc"
-	UpdateUserPassword  = "update.user.password.rpc"
-	LogUserAccountLogin = "user.login.rpc"
+	GetUserAccount      = "get.account.rpc"
+	GetUserAccountById  = "get.account.id.rpc"
+	CreateUserAccount   = "create.account.rpc"
+	UpdateUserPassword  = "update.account.password.rpc"
+	LogUserAccountLogin = "log.account.login.rpc"
 	GetUserByUid        = "get.user.uid.rpc"
 	GetUserByAccountId  = "get.user.account.id.rpc"
 	GetUserResources    = "get.user.resources.rpc"
diff --git a/server/db/operation/userAccount.go b/server/db/operation/userAccount.go
index 5c9452e..ac956c6 100644
--- a/server/db/operation/userAccount.go
+++ b/server/db/operation/userAccount.go
@@ -35,6 +35,15 @@ func (s *UserAccountOp) redisKey(username string) string {
 	return fmt.Sprintf("username:%s", username)
 }
 
+// 创建用户
+func (s *UserAccountOp) Find(uid int64) (*user.UserAccount, pb.ErrCode) {
+	us, code := s.accountOp.Find(uid)
+	if us != nil {
+		us.Password = ""
+	}
+	return us, code
+}
+
 func (s *UserAccountOp) GetUserAccount(username string) (*user.UserAccount, pb.ErrCode) {
 	sUid, err := s.accountRedis.Get(context.Background(), s.redisKey(username)).Result()
 	if err != nil {
diff --git a/server/db/server/handlerUser.go b/server/db/server/handlerUser.go
index dcd059f..024f043 100644
--- a/server/db/server/handlerUser.go
+++ b/server/db/server/handlerUser.go
@@ -18,6 +18,13 @@ func (s *DbService) onGetUserAccount(iMsg *ipb.InternalMsg) *ipb.InternalMsg {
 	return iMsg
 }
 
+func (s *DbService) onGetUserAccountById(iMsg *ipb.InternalMsg) *ipb.InternalMsg {
+	operationDb[user.UserAccount](iMsg, func(us *user.UserAccount) (*user.UserAccount, pb.ErrCode) {
+		return operation.NewUserAccountOp().Find(us.ID)
+	})
+	return iMsg
+}
+
 // 创建帐号
 func (s *DbService) onCreateUserAccount(iMsg *ipb.InternalMsg) *ipb.InternalMsg {
 	operationDb[user.UserAccount](iMsg, operation.NewUserAccountOp().CreateUserAccount)
diff --git a/server/db/server/processor.go b/server/db/server/processor.go
index aadb249..b62a7ac 100644
--- a/server/db/server/processor.go
+++ b/server/db/server/processor.go
@@ -9,6 +9,7 @@ func (s *DbService) initRpcProcessor() {
 	s.RpcProcessor.RegisterMessages(map[string]processor.RpcHandler{
 		rpc.CreateUserAccount:   s.onCreateUserAccount,
 		rpc.GetUserAccount:      s.onGetUserAccount,
+		rpc.GetUserAccountById:  s.onGetUserAccountById,
 		rpc.UpdateUserPassword:  s.onUpdateUserAccount,
 		rpc.LogUserAccountLogin: s.onLogUserAccountLogin,
 		rpc.GetUserByUid:        s.onGetUserByUid,