From e5a71a282e862352bb2a6dfb8538d156126b6678 Mon Sep 17 00:00:00 2001
From: mythxb <mythxb@qq.com>
Date: Thu, 28 Mar 2024 15:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=BB=9F=E4=B8=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/rzyc/advice/log/LogAspect.java   |  2 +-
 .../com/rzyc/controller/AuthController.java   |  2 +-
 .../com/rzyc/controller/DataController.java   | 31 +++++++++++++++++++
 .../main/java/com/common/utils/Constants.java |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/inventory-gov/src/main/java/com/rzyc/advice/log/LogAspect.java b/inventory-gov/src/main/java/com/rzyc/advice/log/LogAspect.java
index eb30d6b..a55e94b 100644
--- a/inventory-gov/src/main/java/com/rzyc/advice/log/LogAspect.java
+++ b/inventory-gov/src/main/java/com/rzyc/advice/log/LogAspect.java
@@ -92,7 +92,7 @@ public class LogAspect {
          * @date 2023/11/22 14:57
          */
         //判断ip访问数量
-        assessIp(ip);
+//        assessIp(ip);
 
 
         Map<String,Object> requestMsg = new HashMap<>();
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/AuthController.java b/inventory-gov/src/main/java/com/rzyc/controller/AuthController.java
index 2217a03..6cda79a 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/AuthController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/AuthController.java
@@ -61,7 +61,7 @@ public class AuthController extends BaseController{
     private static final String postId = "ca97b44c-6384-4b48-8ab8-b4530bf09601";
 
     //默认密码
-    private static final String passwd = "gz123456@";
+    private static final String passwd = "Guixi2024!";
 
     //用户角色
     private static final String userRole = "295EF8C3-902F-41F0-95C8-D3AB9C6DA145";
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java
index 85c19f7..850e130 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java
@@ -6,6 +6,8 @@ import com.common.utils.RandomNumber;
 import com.common.utils.StringUtils;
 import com.common.utils.TypeConversion;
 import com.common.utils.encryption.PasswdFactory;
+import com.common.utils.model.Code;
+import com.common.utils.model.Message;
 import com.common.utils.model.SingleResult;
 import com.rzyc.enums.DelState;
 import com.rzyc.enums.ListTargerType;
@@ -718,4 +720,33 @@ public class DataController extends com.rzyc.controller.BaseController {
         return result;
     }
 
+    /**
+     * 用户密码修改
+     * @version v1.0
+     * @author dong
+     * @date 2024/3/28 14:38
+     */
+    @ApiOperation(value = "用户密码修改", notes = "用户密码修改")
+    @RequestMapping(value = "/userPasswdChange", method = RequestMethod.GET)
+    @ResponseBody
+    public SingleResult<String> userPasswdChange(String passwd)throws Exception{
+        SingleResult<String> result = new SingleResult<>();
+        if(StringUtils.isNotBlank(passwd)){
+            List<SysUser> sysUsers = sysUserMapper.findAll();
+            for (SysUser sysUser : sysUsers){
+                if("政府用户".equals(sysUser.getUsertype())){
+                    String nowPasswd = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysUser.getSysusername(),passwd);
+
+                    //修改密码
+                    sysUserMapper.changePassword(sysUser.getSysuserid(),nowPasswd);
+                }
+            }
+        }else{
+            result.setCode(Code.NO_DATA.getCode());
+            result.setMessage(Message.NO_DATA);
+        }
+
+        return result;
+    }
+
 }
diff --git a/utils/src/main/java/com/common/utils/Constants.java b/utils/src/main/java/com/common/utils/Constants.java
index 39904eb..8ea7512 100644
--- a/utils/src/main/java/com/common/utils/Constants.java
+++ b/utils/src/main/java/com/common/utils/Constants.java
@@ -21,7 +21,7 @@ public final class Constants {
 	public static String ADMIN_PASSWORD = "123456";
 
 	/*密码正则*/
-	public static String PASSWORD_REGULAR = "^(?=.*[a-z])(?=.*\\d)[a-zA-Z\\d]{10,}$";
+	public static String PASSWORD_REGULAR = "^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{10,20}$";
 
 
 	//支付宝回调地址