diff --git a/api/dto/Admin.go b/api/dto/Admin.go index abe7eaf..fad8bac 100644 --- a/api/dto/Admin.go +++ b/api/dto/Admin.go @@ -8,6 +8,7 @@ type Login struct { NickName string `json:"nick_name"` // 昵称 Avatar string `json:"avatar"` // 头像 Token string `json:"token"` // 用户名 + RoleName string `json:"role_name"` // 角色名 } // GetLoginFullAvatar 返回带有指定字符串的头像路径 diff --git a/api/service/admin.go b/api/service/admin.go index c51ca63..a230c2c 100644 --- a/api/service/admin.go +++ b/api/service/admin.go @@ -42,6 +42,9 @@ func (b *AdminService) Login(LoginRequest requests.Login) (*dto.Login, error) { return nil, errors.New("您的账号已被禁用,请联系管理员处理") } + roleDao := dao.AdminRoleDao{} + adminRole, err := roleDao.GetAdminRoleFirstById(adminUser.RoleID) + token := &utils.Token{ UserId: strconv.FormatInt(adminUser.UserID, 10), RoleId: strconv.FormatInt(adminUser.RoleID, 10), @@ -60,6 +63,7 @@ func (b *AdminService) Login(LoginRequest requests.Login) (*dto.Login, error) { NickName: adminUser.NickName, Avatar: adminUser.Avatar, Token: jwt, + RoleName: adminRole.RoleName, } result.GetLoginFullAvatar()