diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java index 90054ff3..e071ff98 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java @@ -469,7 +469,7 @@ public class UserController { */ @GetMapping(value = "/infoWithTenant") @ApiOperation(value = "获取当前用户的用户数量和租户信息") - public BaseResponseInfo randomImage(HttpServletRequest request){ + public BaseResponseInfo infoWithTenant(HttpServletRequest request){ BaseResponseInfo res = new BaseResponseInfo(); try { Map data = new HashMap<>(); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index 57d93e8f..93a8267c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -390,6 +390,11 @@ public class UserService { } data.put("msgTip", msgTip); if(user!=null){ + //校验下密码是不是过于简单 + boolean pwdSimple = false; + if(user.getPassword().equals(Tools.md5Encryp(BusinessConstants.USER_DEFAULT_PASSWORD))) { + pwdSimple = true; + } user.setPassword(null); redisService.storageObjectBySession(token,"clientIp", Tools.getLocalIp(request)); logService.insertLogWithUserId(user.getId(), user.getTenantId(), "用户", @@ -397,6 +402,7 @@ public class UserService { ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); data.put("token", token); data.put("user", user); + data.put("pwdSimple", pwdSimple); } return data; }