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 @@