|
|
|
@ -3,7 +3,6 @@ package com.ruoyi.framework.shiro.service;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
|
|
|
|
import com.ruoyi.common.constant.Constants;
|
|
|
|
import com.ruoyi.common.constant.Constants;
|
|
|
|
import com.ruoyi.common.constant.ShiroConstants;
|
|
|
|
import com.ruoyi.common.constant.ShiroConstants;
|
|
|
|
import com.ruoyi.common.constant.UserConstants;
|
|
|
|
import com.ruoyi.common.constant.UserConstants;
|
|
|
|
@ -27,101 +26,104 @@ import com.ruoyi.project.system.user.service.IUserService;
|
|
|
|
* @author ruoyi
|
|
|
|
* @author ruoyi
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Component
|
|
|
|
@Component
|
|
|
|
public class LoginService {
|
|
|
|
public class LoginService
|
|
|
|
@Autowired
|
|
|
|
{
|
|
|
|
private PasswordService passwordService;
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private PasswordService passwordService;
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private IUserService userService;
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private IUserService userService;
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 登录
|
|
|
|
/**
|
|
|
|
*/
|
|
|
|
* 登录
|
|
|
|
public User login(String username, String password) {
|
|
|
|
*/
|
|
|
|
// 验证码校验
|
|
|
|
public User login(String username, String password)
|
|
|
|
if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA))) {
|
|
|
|
{
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
|
|
|
|
// 验证码校验
|
|
|
|
// SystemLogUtils.log(username, Constants.LOGIN_FAIL,
|
|
|
|
if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
|
|
|
|
// MessageUtils.message("user.jcaptcha.error"));
|
|
|
|
{
|
|
|
|
throw new CaptchaException();
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
|
|
|
|
}
|
|
|
|
throw new CaptchaException();
|
|
|
|
// 用户名或密码为空 错误
|
|
|
|
}
|
|
|
|
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
|
|
|
|
// 用户名或密码为空 错误
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
|
|
|
|
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
|
|
|
|
// SystemLogUtils.log(username, Constants.LOGIN_FAIL,
|
|
|
|
{
|
|
|
|
// MessageUtils.message("not.null"));
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
|
|
|
|
throw new UserNotExistsException();
|
|
|
|
throw new UserNotExistsException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 密码如果不在指定范围内 错误
|
|
|
|
// 密码如果不在指定范围内 错误
|
|
|
|
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
|
|
|
|
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
|
|
|
|
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH)
|
|
|
|
// SystemLogUtils.log(username, Constants.LOGIN_FAIL,
|
|
|
|
{
|
|
|
|
// MessageUtils.message("user.password.not.match"));
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
|
|
|
|
throw new UserPasswordNotMatchException();
|
|
|
|
throw new UserPasswordNotMatchException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 用户名不在指定范围内 错误
|
|
|
|
// 用户名不在指定范围内 错误
|
|
|
|
if (username.length() < UserConstants.USERNAME_MIN_LENGTH || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
|
|
|
|
if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
|
|
|
|
|| username.length() > UserConstants.USERNAME_MAX_LENGTH)
|
|
|
|
// SystemLogUtils.log(username, Constants.LOGIN_FAIL,
|
|
|
|
{
|
|
|
|
// MessageUtils.message("user.password.not.match"));
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
|
|
|
|
throw new UserPasswordNotMatchException();
|
|
|
|
throw new UserPasswordNotMatchException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 查询用户信息
|
|
|
|
// 查询用户信息
|
|
|
|
User user = userService.selectUserByLoginName(username);
|
|
|
|
User user = userService.selectUserByLoginName(username);
|
|
|
|
|
|
|
|
|
|
|
|
if (user == null && maybeMobilePhoneNumber(username)) {
|
|
|
|
if (user == null && maybeMobilePhoneNumber(username))
|
|
|
|
user = userService.selectUserByPhoneNumber(username);
|
|
|
|
{
|
|
|
|
}
|
|
|
|
user = userService.selectUserByPhoneNumber(username);
|
|
|
|
|
|
|
|
}
|
|
|
|
if (user == null && maybeEmail(username)) {
|
|
|
|
|
|
|
|
user = userService.selectUserByEmail(username);
|
|
|
|
if (user == null && maybeEmail(username))
|
|
|
|
}
|
|
|
|
{
|
|
|
|
|
|
|
|
user = userService.selectUserByEmail(username);
|
|
|
|
if (user == null || UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
|
|
|
|
}
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists")));
|
|
|
|
|
|
|
|
// SystemLogUtils.log(username, Constants.LOGIN_FAIL,
|
|
|
|
if (user == null || UserStatus.DELETED.getCode().equals(user.getDelFlag()))
|
|
|
|
// MessageUtils.message("user.not.exists"));
|
|
|
|
{
|
|
|
|
throw new UserNotExistsException();
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists")));
|
|
|
|
}
|
|
|
|
throw new UserNotExistsException();
|
|
|
|
|
|
|
|
}
|
|
|
|
passwordService.validate(user, password);
|
|
|
|
|
|
|
|
|
|
|
|
passwordService.validate(user, password);
|
|
|
|
if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
|
|
|
|
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark())));
|
|
|
|
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
|
|
|
|
// SystemLogUtils.log(username, Constants.LOGIN_FAIL,
|
|
|
|
{
|
|
|
|
// MessageUtils.message("user.blocked", user.getRemark()));
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark())));
|
|
|
|
throw new UserBlockedException(user.getRemark());
|
|
|
|
throw new UserBlockedException(user.getRemark());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
|
|
|
|
// SystemLogUtils.log(username, Constants.LOGIN_SUCCESS,
|
|
|
|
recordLoginInfo(user);
|
|
|
|
// MessageUtils.message("user.login.success"));
|
|
|
|
return user;
|
|
|
|
recordLoginInfo(user);
|
|
|
|
}
|
|
|
|
return user;
|
|
|
|
|
|
|
|
}
|
|
|
|
private boolean maybeEmail(String username)
|
|
|
|
|
|
|
|
{
|
|
|
|
private boolean maybeEmail(String username) {
|
|
|
|
if (!username.matches(UserConstants.EMAIL_PATTERN))
|
|
|
|
if (!username.matches(UserConstants.EMAIL_PATTERN)) {
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private boolean maybeMobilePhoneNumber(String username) {
|
|
|
|
private boolean maybeMobilePhoneNumber(String username)
|
|
|
|
if (!username.matches(UserConstants.MOBILE_PHONE_NUMBER_PATTERN)) {
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
if (!username.matches(UserConstants.MOBILE_PHONE_NUMBER_PATTERN))
|
|
|
|
}
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
/**
|
|
|
|
}
|
|
|
|
* 记录登录信息
|
|
|
|
|
|
|
|
*/
|
|
|
|
/**
|
|
|
|
public void recordLoginInfo(User user) {
|
|
|
|
* 记录登录信息
|
|
|
|
user.setLoginIp(ShiroUtils.getIp());
|
|
|
|
*/
|
|
|
|
user.setLoginDate(DateUtils.getNowDate());
|
|
|
|
public void recordLoginInfo(User user)
|
|
|
|
userService.updateUserInfo(user);
|
|
|
|
{
|
|
|
|
}
|
|
|
|
user.setLoginIp(ShiroUtils.getIp());
|
|
|
|
|
|
|
|
user.setLoginDate(DateUtils.getNowDate());
|
|
|
|
|
|
|
|
userService.updateUserInfo(user);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
RuoYi
6 years ago
committed by
Limy