修改返回值结构,新增角色菜单接口
This commit is contained in:
@@ -6,19 +6,19 @@ import (
|
||||
"errors"
|
||||
"hospital-admin-api/api/dao"
|
||||
"hospital-admin-api/api/requests"
|
||||
"hospital-admin-api/api/responses"
|
||||
"hospital-admin-api/api/responses/basicResponse"
|
||||
"hospital-admin-api/utils"
|
||||
)
|
||||
|
||||
type Basic struct{}
|
||||
|
||||
// Login 登陆
|
||||
func (b *Basic) Login(login requests.Login) (responses.Login, error) {
|
||||
func (b *Basic) Login(login requests.Login) (basicResponse.Login, error) {
|
||||
// 获取用户信息
|
||||
AdminUserDao := dao.AdminUser{}
|
||||
adminUser, err := AdminUserDao.GetAdminUserFirstByAccess(login.Access)
|
||||
if err != nil || adminUser.UserID == 0 {
|
||||
return responses.Login{}, errors.New("用户名或密码错误")
|
||||
return basicResponse.Login{}, errors.New("用户名或密码错误")
|
||||
}
|
||||
|
||||
// 检测用户密码
|
||||
@@ -27,16 +27,16 @@ func (b *Basic) Login(login requests.Login) (responses.Login, error) {
|
||||
passwordString := hex.EncodeToString(password[:])
|
||||
|
||||
if passwordString != adminUser.Password {
|
||||
return responses.Login{}, errors.New("用户名或密码错误")
|
||||
return basicResponse.Login{}, errors.New("用户名或密码错误")
|
||||
}
|
||||
|
||||
// 检测用户状态
|
||||
if adminUser.IsDeleted == 1 {
|
||||
return responses.Login{}, errors.New("非法用户")
|
||||
return basicResponse.Login{}, errors.New("非法用户")
|
||||
}
|
||||
|
||||
if adminUser.IsDisabled == 1 {
|
||||
return responses.Login{}, errors.New("您的账号已被禁用,请联系管理员处理")
|
||||
return basicResponse.Login{}, errors.New("您的账号已被禁用,请联系管理员处理")
|
||||
}
|
||||
|
||||
token := &utils.Token{
|
||||
@@ -48,11 +48,11 @@ func (b *Basic) Login(login requests.Login) (responses.Login, error) {
|
||||
|
||||
jwt, err := token.NewJWT()
|
||||
if err != nil {
|
||||
return responses.Login{}, errors.New("登陆失败")
|
||||
return basicResponse.Login{}, errors.New("登陆失败")
|
||||
}
|
||||
|
||||
// 生成jwt
|
||||
result := responses.Login{
|
||||
result := basicResponse.Login{
|
||||
UserId: adminUser.UserID,
|
||||
NickName: adminUser.NickName,
|
||||
Avatar: adminUser.Avatar,
|
||||
|
||||
Reference in New Issue
Block a user