Commit c4ccc4c1 authored by wzp's avatar wzp

修改bug

parent bc9a9107
......@@ -205,12 +205,16 @@ public class ChinaMobileRestApiController extends BaseController {
return resultMap;
}
if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
throw new DisabledAccountException("此帐号已禁用,请联系管理员!");
resultMap.put("resultCode", "400");
resultMap.put("message", "此帐号已禁用,请联系管理员!");
return resultMap;
}
if (user.getPermanent() != null && !user.getPermanent()) {
if (user.getEffectiveDate().isAfter(LocalDate.now()) || user.getExiredDate().isBefore(LocalDate.now())) {
throw new DisabledAccountException("此帐号已失效,请联系管理员!");
resultMap.put("resultCode", "400");
resultMap.put("message", "此帐号已失效,请联系管理员!");
return resultMap;
}
}
......@@ -225,7 +229,9 @@ public class ChinaMobileRestApiController extends BaseController {
// stringRedisTemplate.expire(SHIRO_IS_LOCK + username, 12, TimeUnit.HOURS);
// }
// }
throw new IncorrectCredentialsException("用户名或密码不正确!");
resultMap.put("resultCode", "400");
resultMap.put("message", "用户名或密码不正确!");
return resultMap;
}
String token = JwtTokenUtil.sign(username, user.getId());
// 将token信息存入Redis
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment