|
@@ -122,8 +122,8 @@ public class UserServiceImpl implements UserService {
|
|
|
public Result backUserLogin(User user) {
|
|
|
//获取登陆失败次数
|
|
|
Integer count = (Integer) redisUtil.get("Number of password errors:" + user.getUserName());
|
|
|
- if (Blank.isEmpty(count)){
|
|
|
- count=0;
|
|
|
+ if (Blank.isEmpty(count)) {
|
|
|
+ count = 0;
|
|
|
}
|
|
|
try {
|
|
|
user.setPassword(RSAUtil.decrypt(user.getPassword(), "UTF-8"));
|
|
@@ -134,8 +134,8 @@ public class UserServiceImpl implements UserService {
|
|
|
if (Blank.isEmpty(isExistUser)) {
|
|
|
//记录登陆失败次数
|
|
|
count++;
|
|
|
- if (count>=5){
|
|
|
- if (count.equals(5)){
|
|
|
+ if (count >= 5) {
|
|
|
+ if (count.equals(5)) {
|
|
|
//账号锁定5分钟
|
|
|
redisUtil.set("Number of password errors:" + user.getUserName(), count, 300);
|
|
|
}
|
|
@@ -143,9 +143,9 @@ public class UserServiceImpl implements UserService {
|
|
|
long minutes = expire / 60;
|
|
|
long second = expire % 60;
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "密码错误次数过多账号已锁定,请" + minutes + "分" + second + "秒后再试");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
redisUtil.set("Number of password errors:" + user.getUserName(), count, 300);
|
|
|
- return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "密码错误,还可尝试" + (5 - count) + "次");
|
|
|
+ return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "密码错误,还可尝试" + (5 - count) + "次");
|
|
|
}
|
|
|
}
|
|
|
if (isExistUser.getUserType() != ConstantStr.BACK_USER) {
|
|
@@ -375,7 +375,7 @@ public class UserServiceImpl implements UserService {
|
|
|
@Override
|
|
|
public Result relieveUserRoles(List<UserRole> userRoles) {
|
|
|
Integer num = userDao.deleteByUserIdRoleIds(userRoles);
|
|
|
- if (num<=0){
|
|
|
+ if (num <= 0) {
|
|
|
return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "解除角色失败");
|
|
|
}
|
|
|
return Result.ok(num);
|
|
@@ -391,12 +391,12 @@ public class UserServiceImpl implements UserService {
|
|
|
} catch (Exception e) {
|
|
|
throw new CustomException(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
|
|
|
}
|
|
|
- if (Blank.isEmpty(oldPassword,newPassword)){
|
|
|
+ if (Blank.isEmpty(oldPassword, newPassword)) {
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "数据有误");
|
|
|
}
|
|
|
//判断原始密码是否正确
|
|
|
User isExistUser = userDao.getUserByNamePass(user.getUserName(), EncryptUtils.StrToMD5(oldPassword));
|
|
|
- if (isExistUser==null){
|
|
|
+ if (isExistUser == null) {
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "旧密码输入错误");
|
|
|
}
|
|
|
//修改密码
|
|
@@ -408,7 +408,7 @@ public class UserServiceImpl implements UserService {
|
|
|
@Override
|
|
|
public Result updatePasswordByAdmin(User user) {
|
|
|
//判断当前登陆人是否是管理员
|
|
|
- if (! userUtil.haveAdminRights()){
|
|
|
+ if (!userUtil.haveAdminRights()) {
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "没有操作权限");
|
|
|
}
|
|
|
String newPassword;
|
|
@@ -417,7 +417,7 @@ public class UserServiceImpl implements UserService {
|
|
|
} catch (Exception e) {
|
|
|
throw new CustomException(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
|
|
|
}
|
|
|
- if (Blank.isEmpty(newPassword)){
|
|
|
+ if (Blank.isEmpty(newPassword)) {
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "数据有误");
|
|
|
}
|
|
|
user.setNewPassword(EncryptUtils.StrToMD5(newPassword));
|