From 5bf54595909da0b0e5fc9526d40e464a3f895c87 Mon Sep 17 00:00:00 2001
From: lijiaqi <lijq@ydool.com>
Date: Mon, 24 Jul 2023 14:11:06 +0800
Subject: [PATCH] update

---
 .idea/jarRepositories.xml                     | 20 +++++++++----------
 bin/update.sh                                 |  2 +-
 .../com/ydool/common/utils/PasswordUtil.java  |  2 +-
 .../system/service/impl/AuthServiceImpl.java  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index f9c6ee3..4665800 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="rdd-releases" />
       <option name="name" value="rdd-releases" />
       <option name="url" value="https://packages.aliyun.com/maven/repository/2226303-release-LbOUW1/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="rdc-releases" />
       <option name="name" value="rdc-releases" />
@@ -36,16 +36,16 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="rdc-snapshots" />
       <option name="name" value="rdc-snapshots" />
       <option name="url" value="https://packages.aliyun.com/maven/repository/2123695-snapshot-LiQOYE/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="snapshots" />
       <option name="name" value="snapshots" />
diff --git a/bin/update.sh b/bin/update.sh
index ae8d533..0cf2da6 100644
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -4,5 +4,5 @@ _ip=119.3.109.134
 cd ../
 mvn clean package
 scp  target/build/*.jar root@${_ip}:${_pwd}
-#scp target/build/lib/*.* root@${_ip}:${_pwd}/lib
+scp target/build/lib/*.* root@${_ip}:${_pwd}/lib
 ssh root@${_ip} "cd ${_pwd}; sh ./start.sh"
\ No newline at end of file
diff --git a/src/main/java/com/ydool/common/utils/PasswordUtil.java b/src/main/java/com/ydool/common/utils/PasswordUtil.java
index 7ce441b..850a153 100644
--- a/src/main/java/com/ydool/common/utils/PasswordUtil.java
+++ b/src/main/java/com/ydool/common/utils/PasswordUtil.java
@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
 public class PasswordUtil {
 
 	public static Boolean valid(String password) {
-		String regexp = "^(?=.[a-z])(?=.[A-Z])(?=.\\d)(?=.[!@#$%^&*]).{8,}$";
+		String regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,24}$";
 		return Pattern.matches(regexp, password);
 	}
 
diff --git a/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java b/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java
index 987d86b..b48c446 100644
--- a/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java
+++ b/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java
@@ -146,7 +146,7 @@ public class AuthServiceImpl extends BaseService<UserMapper, User> implements IA
      */
     @Override
     public AjaxResult editPassword(String oldPassword, String newPassword) {
-        if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符，并且长度至少为8位");
+        if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符，并且长度至少为8位,最长24位");
         String loginId = StpUtil.getLoginIdAsString();
         User user = getById(loginId);
         if (!user.getPassword().equals(PasswordUtil.password(user.getSalt(), oldPassword))) return AjaxResult.fail(
@@ -168,7 +168,7 @@ public class AuthServiceImpl extends BaseService<UserMapper, User> implements IA
      */
     @Override
     public AjaxResult newPassword(String newPassword) {
-        if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符，并且长度至少为8位");
+        if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符，并且长度至少为8位,最长24位");
         String loginId = StpUtil.getLoginIdAsString();
         String salt = RandomUtil.randomString(6);
         String password = PasswordUtil.password(salt, newPassword);