提交修改
This commit is contained in:
parent
377b5be64c
commit
46c7ca8835
@ -197,6 +197,8 @@ public class SysLoginController extends AbstractController {
|
|||||||
return R.error("账号不存在!");
|
return R.error("账号不存在!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//测试环境将不进行短信验证码,
|
||||||
|
if (!StringUtil.equals(environment, Constant.INVELOMENT_TYPE_TEST)) {
|
||||||
//账号不存在、密码错误
|
//账号不存在、密码错误
|
||||||
if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
|
if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
|
||||||
return R.error("密码不正确!");
|
return R.error("密码不正确!");
|
||||||
@ -213,10 +215,9 @@ public class SysLoginController extends AbstractController {
|
|||||||
}
|
}
|
||||||
codeRecordEntity.setIsCheck(1);
|
codeRecordEntity.setIsCheck(1);
|
||||||
codeRecordService.updateById(codeRecordEntity);
|
codeRecordService.updateById(codeRecordEntity);
|
||||||
|
}
|
||||||
//生成token,并保存到数据库
|
//生成token,并保存到数据库
|
||||||
R r = sysUserTokenService.createToken(user);
|
R r = sysUserTokenService.createToken(user);
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user