去掉登录控制器不需要的东西
This commit is contained in:
@@ -89,24 +89,15 @@ public class LoginRestController {
|
|||||||
*/
|
*/
|
||||||
private static final String LOGIN_FAIL_MAP = "loginFailMap";
|
private static final String LOGIN_FAIL_MAP = "loginFailMap";
|
||||||
|
|
||||||
/**
|
|
||||||
* 服务层装配
|
|
||||||
*
|
|
||||||
* @see UserEOService
|
|
||||||
*/
|
|
||||||
@Resource
|
@Resource
|
||||||
private IUserEoService userService;
|
private IUserEoService userService;
|
||||||
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private SystemAuthorizingRealm systemAuthorizingRealm;
|
private SystemAuthorizingRealm systemAuthorizingRealm;
|
||||||
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private UserEODao userEODao;
|
private UserEODao userEODao;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* eo vo 转换
|
* eo vo 转换
|
||||||
*
|
*
|
||||||
@@ -330,8 +321,6 @@ public class LoginRestController {
|
|||||||
subject.login(token);
|
subject.login(token);
|
||||||
//认证完成删除session中VerifyCode
|
//认证完成删除session中VerifyCode
|
||||||
request.getSession().removeAttribute("VerifyCode");
|
request.getSession().removeAttribute("VerifyCode");
|
||||||
//认证成功将库里错误次数改为0
|
|
||||||
// userService.updatePasswordErrorsNumberByAccount(username,0);
|
|
||||||
userEO = UserUtils.getUser();
|
userEO = UserUtils.getUser();
|
||||||
request.getSession().setAttribute(RequestUtils.LOGIN_USER, userEO);
|
request.getSession().setAttribute(RequestUtils.LOGIN_USER, userEO);
|
||||||
|
|
||||||
@@ -353,7 +342,6 @@ public class LoginRestController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//注销原session,为的是重置sessionId
|
//注销原session,为的是重置sessionId
|
||||||
//session.invalidate();
|
|
||||||
subject.logout();
|
subject.logout();
|
||||||
|
|
||||||
//将临时map中的数据转移至新session
|
//将临时map中的数据转移至新session
|
||||||
@@ -363,7 +351,6 @@ public class LoginRestController {
|
|||||||
}
|
}
|
||||||
System.out.println(session.getId());
|
System.out.println(session.getId());
|
||||||
|
|
||||||
// Session session = subject.getSession();
|
|
||||||
if (null != session) {
|
if (null != session) {
|
||||||
CacheUtils.putShiroSessionCache(userEO.getUsid(), session.getId());
|
CacheUtils.putShiroSessionCache(userEO.getUsid(), session.getId());
|
||||||
}
|
}
|
||||||
@@ -371,21 +358,15 @@ public class LoginRestController {
|
|||||||
return Result.success(beanMapper.map(returnEO, UserVO.class));
|
return Result.success(beanMapper.map(returnEO, UserVO.class));
|
||||||
|
|
||||||
} catch (CaptchaException e) {
|
} catch (CaptchaException e) {
|
||||||
// systemAuthorizingRealm.increaseLoginErrorCount(username);
|
|
||||||
log.info("验证码验证失败");
|
log.info("验证码验证失败");
|
||||||
return Result.error("r0012", "您输入的验证码不正确", systemAuthorizingRealm.isNeedValidCode(username));
|
return Result.error("r0012", "您输入的验证码不正确", systemAuthorizingRealm.isNeedValidCode(username));
|
||||||
} catch (UnknownAccountException e) {
|
} catch (UnknownAccountException e) {
|
||||||
// systemAuthorizingRealm.increaseLoginErrorCount(username);
|
|
||||||
log.info("用户[{}]身份验证失败", username);
|
log.info("用户[{}]身份验证失败", username);
|
||||||
return Result.error("r0011", "您输入的帐号或密码有误", systemAuthorizingRealm.isNeedValidCode(username));
|
return Result.error("r0011", "您输入的帐号或密码有误", systemAuthorizingRealm.isNeedValidCode(username));
|
||||||
} catch (IncorrectCredentialsException e) {
|
} catch (IncorrectCredentialsException e) {
|
||||||
// systemAuthorizingRealm.increaseLoginErrorCount(username);
|
|
||||||
log.info("用户[{}]密码验证失败", username);
|
log.info("用户[{}]密码验证失败", username);
|
||||||
//增加错误次数
|
|
||||||
// return passwordErrorsNumber(username);
|
|
||||||
return Result.error("r0011", "您输入的帐号或密码有误", systemAuthorizingRealm.isNeedValidCode(username));
|
return Result.error("r0011", "您输入的帐号或密码有误", systemAuthorizingRealm.isNeedValidCode(username));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// systemAuthorizingRealm.increaseLoginErrorCount(username);
|
|
||||||
log.error(e.getMessage(), e);
|
log.error(e.getMessage(), e);
|
||||||
return Result.error("r0013", e.getMessage(), systemAuthorizingRealm.isNeedValidCode(username));
|
return Result.error("r0013", e.getMessage(), systemAuthorizingRealm.isNeedValidCode(username));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user