|
@ -93,7 +93,6 @@ public class SysLoginController extends BaseController { |
|
|
throw new BaseException("对不起,请输入您的账号!!"); |
|
|
throw new BaseException("对不起,请输入您的账号!!"); |
|
|
} |
|
|
} |
|
|
AjaxResult ajax = AjaxResult.success(); |
|
|
AjaxResult ajax = AjaxResult.success(); |
|
|
|
|
|
|
|
|
// 验证码校验
|
|
|
// 验证码校验
|
|
|
//TODO
|
|
|
//TODO
|
|
|
// String verifyKey = Constants.CAPTCHA_CODE_KEY + loginBody.getUuid();
|
|
|
// String verifyKey = Constants.CAPTCHA_CODE_KEY + loginBody.getUuid();
|
|
@ -102,8 +101,6 @@ public class SysLoginController extends BaseController { |
|
|
// AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_FAIL, "验证码输入错误"));
|
|
|
// AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_FAIL, "验证码输入错误"));
|
|
|
// throw new BaseException("对不起,您的验证码输入错误");
|
|
|
// throw new BaseException("对不起,您的验证码输入错误");
|
|
|
// }
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SysUser user = new SysUser(); |
|
|
SysUser user = new SysUser(); |
|
|
user.setUserName(loginBody.getUsername()); |
|
|
user.setUserName(loginBody.getUsername()); |
|
|
user.setIsPcUser(YesOrNo.NO); |
|
|
user.setIsPcUser(YesOrNo.NO); |
|
@ -123,13 +120,13 @@ public class SysLoginController extends BaseController { |
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_FAIL, "账户已停用")); |
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_FAIL, "账户已停用")); |
|
|
throw new BaseException("对不起,您的账号:" + loginBody.getUsername() + " 已停用"); |
|
|
throw new BaseException("对不起,您的账号:" + loginBody.getUsername() + " 已停用"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 判断密码校验
|
|
|
// 判断密码校验
|
|
|
if(PasswordUtil.validatePassword(loginBody.getPassword(), user.getPassword())) { |
|
|
if(PasswordUtil.validatePassword(loginBody.getPassword(), user.getPassword())) { |
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_SUCCESS, "登录成功")); |
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_SUCCESS, "登录成功")); |
|
|
StpUtil.login(user.getId()); |
|
|
StpUtil.login(user.getId()); |
|
|
StpUtil.getSession().set("jianwei-user",user); |
|
|
StpUtil.getSession().set("jianwei-user",user); |
|
|
ajax.put("token",StpUtil.getTokenValue()); |
|
|
ajax.put("token",StpUtil.getTokenValue()); |
|
|
|
|
|
userService.updateWithReids(user); |
|
|
}else { |
|
|
}else { |
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_FAIL, "账号或密码错误")); |
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_FAIL, "账号或密码错误")); |
|
|
throw new BaseException("对不起,您的账号或密码错误"); |
|
|
throw new BaseException("对不起,您的账号或密码错误"); |
|
@ -221,6 +218,7 @@ public class SysLoginController extends BaseController { |
|
|
StpUtil.login(sysUser.getId()); |
|
|
StpUtil.login(sysUser.getId()); |
|
|
StpUtil.getSession().set("jianwei-user",sysUser); |
|
|
StpUtil.getSession().set("jianwei-user",sysUser); |
|
|
String tokenValue = StpUtil.getTokenValue(); |
|
|
String tokenValue = StpUtil.getTokenValue(); |
|
|
|
|
|
userService.updateWithReids(sysUser); |
|
|
ajax.put("token",tokenValue); |
|
|
ajax.put("token",tokenValue); |
|
|
ajax.put("authorization",token); |
|
|
ajax.put("authorization",token); |
|
|
RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&authorization="+token); |
|
|
RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&authorization="+token); |
|
|