From 27473884c87d4cd52d5d68a9328f6918e7d779ca Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 8 Sep 2024 22:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=86=E7=A0=81=E5=A4=8D=E6=9D=82=E5=BA=A6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/controller/UserController.java    | 2 +-
 .../src/main/java/com/jsh/erp/service/user/UserService.java | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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<String, Object> 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;
     }