[update]

xinnengyuan/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -46,7 +46,12 @@ public class SysRegisterService {
         String password = registerBody.getPassword();
         // 校验用户类型是否存在
         String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
-
+        // 校验密码是否符合要求
+        String pattern = "^(?!.*\\s)(?!^[a-zA-Z]+$)(?!^[0-9]+$)(?!^[^a-zA-Z0-9]+$)(?!^[a-zA-Z0-9]+$).{8,18}$";
+        boolean isValid = password.matches(pattern);
+        if (!isValid) {
+            throw new UserException("注册失败，密码需满足8–18位，包含大小写字母、数字、特殊字符中的至少三种组合");
+        }
         boolean captchaEnabled = captchaProperties.getEnable();
         // 验证码开关
         if (captchaEnabled) {

xinnengyuan/ruoyi-admin/src/main/resources/application.yml

@@ -148,11 +148,11 @@ mybatis-plus:
   # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效
   enableLogicDelete: true
   # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper
-  mapperPackage: org.dromara.**.mapper
+  mapperPackage: org.dromara.**.mapper,org.dromara.app.**.mapper
   # 对应的 XML 文件位置
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper/app/**/*Mapper.xml
   # 实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: org.dromara.**.domain
+  typeAliasesPackage: org.dromara.**.domain,org.dromara.app.**.domain
   global-config:
     dbConfig:
       # 主键类型
@@ -193,6 +193,7 @@ api-decrypt:
     - /v3/api-docs/**    # 放行OpenAPI文档
     - /actuator/**       # 放行监控接口
     - /other/ys7Device/webhook    # 放行萤石云设备回调接口
+    - /auth/register # 放行注册接口
 
 springdoc:
   api-docs:
@@ -252,6 +253,8 @@ springdoc:
       packages-to-scan: org.dromara.drone
     - group: 20.代码生成模块
       packages-to-scan: org.dromara.generator
+    - group: 16.app模块
+      packages-to-scan: org.dromara.app
 # knife4j的增强配置，不需要增强可以不配
 knife4j:
   enable: true

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/CmdTest.java

@@ -11,7 +11,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * @author lcj
+ * @author lilemy
  * @date 2025/4/23 10:15
  */
 @SpringBootTest

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java

@@ -17,7 +17,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author lcj
+ * @author lilemy
  * @date 2025/5/30 9:48
  */
 @Slf4j

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/PDFTest.java

@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author lcj
+ * @author lilemy
  * @date 2025/7/7 10:13
  */
 @Slf4j

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/RecognizerTest.java

@@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import java.util.List;
 
 /**
- * @author lcj
+ * @author lilemy
  * @date 2025/7/21 11:35
  */
 @Slf4j

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/ViolationRecordTest.java

@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author lcj
+ * @author lilemy
  * @date 2025/7/22 15:36
  */
 @SpringBootTest

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/Ys7Test.java

@@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import java.util.List;
 
 /**
- * @author lcj
+ * @author lilemy
  * @date 2025/6/12 17:06
  */
 @Slf4j