diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index 1fd53c506..f023bbc9e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -268,6 +268,9 @@ public class OnlineUserService { if (userInfo == null) { throw new BadRequestException("当前用户不存在!"); } + if (userInfo.getIs_used() == false) { + throw new BadRequestException("当前用户已被锁定!"); + } String userName = userInfo.getUsername(); if (!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { Boolean aBoolean = redisTemplate.hasKey("LoginName:" + userName); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 42229287e..440333c81 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -125,7 +125,7 @@ public class ISysUserServiceImpl extends ServiceImpl imp } catch (Exception ex) { throw new RuntimeException(); } - if (ObjectUtil.isNotEmpty(sysUser.getPassword())) { + if (ObjectUtil.isNotEmpty(sysUser.getPassword()) && sysUser.getPassword().length() != 32) { sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), GeneralDefinition.SALT)); } sysUser.setUpdate_time(new Date());