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