nnnn
This commit is contained in:
@@ -100,11 +100,6 @@ public class CaiLoginManager {
|
||||
|
||||
public String login(String username,String password){
|
||||
String clientIP = ServletUtils.getClientIP();
|
||||
Boolean b = ipBlackService.checkIp(clientIP);
|
||||
if(b){
|
||||
log.error("登录拦截了异常IP={}", clientIP);
|
||||
throw new ServiceException("40305");
|
||||
}
|
||||
User user = userService.getByUsername(username);
|
||||
if(user == null){
|
||||
throw new ServiceException("用户不存在或密码错误");
|
||||
@@ -148,7 +143,8 @@ public class CaiLoginManager {
|
||||
throw new ServiceException(error);
|
||||
}else{
|
||||
String error = String.format("密码错误,已错误%s次,还剩%s次", num, passwordMaxNum-num);
|
||||
throw new ServiceException(error);
|
||||
// throw new ServiceException(error);
|
||||
throw new ServiceException("用户不存在或密码错误");
|
||||
}
|
||||
}
|
||||
redissonClient.getAtomicLong(key).delete();
|
||||
@@ -164,17 +160,17 @@ public class CaiLoginManager {
|
||||
}
|
||||
|
||||
public String register(CaiRegisterUser caiUser) {
|
||||
User user = userService.getByUsername(caiUser.getUsername());
|
||||
if(user != null){
|
||||
throw new ServiceException("手机号已存在");
|
||||
}
|
||||
if(!caiUser.getPassword().equals(caiUser.getPasswordCheck())){
|
||||
throw new ServiceException("两次输入密码不一致,请检查");
|
||||
}
|
||||
User user = userService.getByUsername(caiUser.getUsername());
|
||||
if(user != null){
|
||||
throw new ServiceException("手机号已存在或验证码错误");
|
||||
}
|
||||
if(!caiUser.isSystemOp()){
|
||||
boolean check = smsVerifyService.check(CodeEnum.REGISTER, caiUser.getUsername(), caiUser.getCode());
|
||||
if(!check){
|
||||
throw new ServiceException("验证码错误");
|
||||
throw new ServiceException("手机号已存在或验证码错误");
|
||||
}
|
||||
}
|
||||
// 加锁
|
||||
@@ -383,13 +379,13 @@ public class CaiLoginManager {
|
||||
}
|
||||
|
||||
public void resetPassword(ResetPasswordReq code) {
|
||||
User user = userService.getByUsername(code.getMobile());
|
||||
if(user == null){
|
||||
throw new ServiceException("账户不存在");
|
||||
}
|
||||
boolean check = smsVerifyService.check(CodeEnum.RESET_PASSWORD, code.getMobile(), code.getCode());
|
||||
if(!check){
|
||||
throw new ServiceException("验证码错误");
|
||||
throw new ServiceException("账户不存在或验证码错误");
|
||||
}
|
||||
User user = userService.getByUsername(code.getMobile());
|
||||
if(user == null){
|
||||
throw new ServiceException("账户不存在或验证码错误");
|
||||
}
|
||||
userService.resetPassword(user.getId(),code.getPassword());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user