登录检查user空的情况

This commit is contained in:
TsMask
2023-09-01 10:29:52 +08:00
parent 582a97673d
commit 95591c1753

View File

@@ -90,7 +90,7 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
*/ */
validUser, user, err := dborm.XormCheckLoginUser(oAuthBody.UserName, validUser, user, err := dborm.XormCheckLoginUser(oAuthBody.UserName,
oAuthBody.Value, config.GetYamlConfig().Auth.Crypt) oAuthBody.Value, config.GetYamlConfig().Auth.Crypt)
if !validUser && err != nil { if !validUser || err != nil {
// response 400-4 // response 400-4
log.Error("Authentication failed, mismatch user or password") log.Error("Authentication failed, mismatch user or password")
services.ResponseErrorWithJson(w, 400, err.Error()) services.ResponseErrorWithJson(w, 400, err.Error())
@@ -112,13 +112,17 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
return return
} }
// 缓存用户信息 if user != nil {
account.CacheLoginUser(user) // 缓存用户信息
// 角色权限集合,管理员拥有所有权限 account.CacheLoginUser(user)
userId := fmt.Sprint(user.Id) // 角色权限集合,管理员拥有所有权限
isAdmin := conf.IsAdmin(userId) userId := fmt.Sprint(user.Id)
roles, perms := service.NewServiceAccount.RoleAndMenuPerms(userId, isAdmin) isAdmin := conf.IsAdmin(userId)
services.ResponseStatusOK200LoginWhitRP(w, token, user, roles, perms) roles, perms := service.NewServiceAccount.RoleAndMenuPerms(userId, isAdmin)
services.ResponseStatusOK200LoginWhitRP(w, token, user, roles, perms)
return
}
services.ResponseBadRequest400IncorrectLogin(w)
} }
func LogoutFromOMC(w http.ResponseWriter, r *http.Request) { func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {