wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-09-18 16:07:33 +08:00
parent 377b5be64c
commit 46c7ca8835
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/lz/modules/sys/controller/SysLoginController.java
View File

@ -197,26 +197,27 @@ public class SysLoginController extends AbstractController {
return R.error("账号不存在!"); return R.error("账号不存在!");
} }
} }
//账号不存在、密码错误 //测试环境将不进行短信验证码，
if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) { if (!StringUtil.equals(environment, Constant.INVELOMENT_TYPE_TEST)) {
return R.error("密码不正确!"); //账号不存在、密码错误
} if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
//账号锁定 return R.error("密码不正确!");
if (user.getStatus() == 0) { }
return R.error("账号已被停用,请联系管理员"); //账号锁定
} if (user.getStatus() == 0) {
String verifyCode = form.getVerifyCode(); return R.error("账号已被停用,请联系管理员");
CodeRecordEntity codeRecordEntity = codeRecordService.getOne(new QueryWrapper<CodeRecordEntity>().eq("send_account", user.getMobile()).eq("verify_code", verifyCode).eq("is_check", 0).ge("gmt_create", DateUtils.addDateMinutes(new Date(), -30))); }
String verifyCode = form.getVerifyCode();
CodeRecordEntity codeRecordEntity = codeRecordService.getOne(new QueryWrapper<CodeRecordEntity>().eq("send_account", user.getMobile()).eq("verify_code", verifyCode).eq("is_check", 0).ge("gmt_create", DateUtils.addDateMinutes(new Date(), -30)));
if (codeRecordEntity == null) { if (codeRecordEntity == null) {
return R.error("短信验证码不正确！"); return R.error("短信验证码不正确！");
}
codeRecordEntity.setIsCheck(1);
codeRecordService.updateById(codeRecordEntity);
} }
codeRecordEntity.setIsCheck(1);
codeRecordService.updateById(codeRecordEntity);
//生成token，并保存到数据库 //生成token，并保存到数据库
R r = sysUserTokenService.createToken(user); R r = sysUserTokenService.createToken(user);
return r; return r;
} }