|
|
@ -11,6 +11,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; |
|
|
|
import com.ruoyi.common.core.domain.model.LoginUser; |
|
|
|
import com.ruoyi.common.enums.UserStatus; |
|
|
|
import com.ruoyi.common.exception.ServiceException; |
|
|
|
import com.ruoyi.common.utils.MessageUtils; |
|
|
|
import com.ruoyi.common.utils.StringUtils; |
|
|
|
import com.ruoyi.system.service.ISysUserService; |
|
|
|
|
|
|
@ -40,17 +41,17 @@ public class UserDetailsServiceImpl implements UserDetailsService |
|
|
|
if (StringUtils.isNull(user)) |
|
|
|
{ |
|
|
|
log.info("登录用户:{} 不存在.", username); |
|
|
|
throw new ServiceException("登录用户:" + username + " 不存在"); |
|
|
|
throw new ServiceException(MessageUtils.message("user.not.exists")); |
|
|
|
} |
|
|
|
else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) |
|
|
|
{ |
|
|
|
log.info("登录用户:{} 已被删除.", username); |
|
|
|
throw new ServiceException("对不起,您的账号:" + username + " 已被删除"); |
|
|
|
throw new ServiceException(MessageUtils.message("user.password.delete")); |
|
|
|
} |
|
|
|
else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) |
|
|
|
{ |
|
|
|
log.info("登录用户:{} 已被停用.", username); |
|
|
|
throw new ServiceException("对不起,您的账号:" + username + " 已停用"); |
|
|
|
throw new ServiceException(MessageUtils.message("user.blocked")); |
|
|
|
} |
|
|
|
|
|
|
|
passwordService.validate(user); |
|
|
|