【v3.8.0 合并】Merge remote-tracking branch 'origin/master' into springboot3

# Conflicts: # README.md # jeecg-boot/db/tables_nacos.sql # jeecg-boot/jeecg-boot-base-core/pom.xml # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java # jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java # jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiLogController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiPermissionController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApi.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiAuth.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiHeader.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiLog.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiParam.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiAuthFilter.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiLogMapper.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiLogService.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai # jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml # jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/config/flyway/FlywayConfig.java # jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml # jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml # jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml # jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java # jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java # jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java # jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/controller/JeecgMqTestController.java # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java # jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java # jeecg-boot/pom.xml
2026-01-03 12:05:28 +08:00 · 2025-05-15 20:01:54 +08:00
parent 197d7adaaf 9aea5de668
commit a00fcae3a3
639 changed files with 25705 additions and 10187 deletions
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
@ -11,6 +11,6 @@ WORKDIR /jeecg-boot
 EXPOSE 8080

 #ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/jeecg-system-start-3.7.3.jar ./
+ADD ./target/jeecg-system-start-3.8.0.jar ./

-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.7.3.jar
+CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.8.0.jar
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-module-system</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.7.3</version>
+        <version>3.8.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -25,6 +25,15 @@
            <version>${jeecgboot.version}</version>
        </dependency>
        
+        <!-- AI大模型管理
+        TODO 未改好111
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-module-airag</artifactId>
+            <version>${jeecgboot.version}</version>
+        </dependency>
+        -->
+        
        <!-- flyway 数据库自动升级 
        <dependency>
            <groupId>org.flywaydb</groupId>
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/config/flyway/FlywayConfig.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/config/flyway/FlywayConfig.java
@ -43,7 +43,7 @@ public class FlywayConfig {
    /**
     * 迁移sql脚本文件存放路径，官方默认db/migration
     */
-    @Value("${spring.flyway.locations:}")
+    @Value("${spring.flyway.locations:classpath:flyway/sql/mysql}")
    private String locations;

    /**
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@ -1,9 +1,8 @@
 server:
  port: 8080
  undertow:
-    # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1
-    #    max-http-post-size: 10MB
-    worker-threads: 16 # 4核CPU标准配置
+    # max-http-post-size: 10MB # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1
+    worker-threads: 16  # 4核CPU标准配置
    buffers:
      websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB
      io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB
@ -25,27 +24,9 @@ management:
        include: metrics,httpexchanges,jeecghttptrace

 spring:
-  # flyway配置
  flyway:
    # 是否启用flyway
    enabled: true
-    # 编码格式，默认UTF-8
-    encoding: UTF-8
-    # 迁移sql脚本文件存放路径，官方默认db/migration
-    locations: classpath:flyway/sql/mysql
-    # 迁移sql脚本文件名称的前缀，默认V
-    sql-migration-prefix: V
-    # 迁移sql脚本文件名称的分隔符，默认2个下划线__
-    sql-migration-separator: __
-    # 避免带${}sql执行失败
-    placeholder-prefix: '#('
-    placeholder-suffix: )
-    # 迁移sql脚本文件名称的后缀
-    sql-migration-suffixes: .sql
-    # 迁移时是否进行校验，默认true
-    validate-on-migrate: true
-    # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
-    baseline-on-migrate: true
    # 是否关闭要清除已有库下的表功能,生产环境必须为true,否则会删库，非常重要！！！
    clean-disabled: true
  servlet:
@ -59,12 +40,12 @@ spring:
    username: jeecgos@163.com
    password: ??
    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+      mail.smtp.timeout: 10000  # 连接超时（毫秒）
+      mail.smtp.connectiontimeout: 10000  # 连接超时（毫秒）
+      mail.smtp.writetimeout: 10000  # 写入超时（毫秒）
+      mail.smtp.auth: true
+      smtp.ssl.enable: true
+      mail.debug: true  # 启用调试模式(查看详细日志)
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
@ -212,6 +193,15 @@ jeecg:
    apiKey: ??
    apiHost: https://api.deepseek.com
    timeout: 60
+  # AIRag向量库
+  ai-rag:
+    embed-store:
+      host: 127.0.0.1
+      port: 5432
+      database: postgres
+      user: postgres
+      password: postgres
+      table: embeddings
  # 平台上线安全配置
  firewall:
    # 数据源安全 (开启后，Online报表和图表的数据源为必填)
@ -293,11 +283,6 @@ jeecg:
    app-id: ??
    api-key: ??
    secret-key: ??
-  # ElasticSearch 6设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
 #cas单点登录
 cas:
  prefixUrl: http://cas.example.org:8443/cas
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml
@ -1,7 +1,11 @@
 server:
  port: 8080
-  tomcat:
-    max-swallow-size: -1
+  undertow:
+    # max-http-post-size: 10MB # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1
+    worker-threads: 16  # 4核CPU标准配置
+    buffers:
+      websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB
+      io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -20,7 +24,6 @@ management:
        include: metrics,httptrace-new

 spring:
-  # flyway配置
  flyway:
    # 是否启用flyway
    enabled: false
@ -35,12 +38,8 @@ spring:
    username: jeecgos@163.com
    password: ??
    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+      mail.smtp.auth: true
+      smtp.ssl.enable: true
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
@ -167,6 +166,15 @@ jeecg:
    apiKey: ??
    apiHost: https://api.deepseek.com
    timeout: 60
+  # AIRag向量库
+  ai-rag:
+    embed-store:
+      host: 127.0.0.1
+      port: 5432
+      database: postgres
+      user: postgres
+      password: postgres
+      table: embeddings
  # 平台上线安全配置
  firewall:
    # 数据源安全 (开启后，Online报表和图表的数据源为必填)
@ -231,11 +239,6 @@ jeecg:
    password:
    type: STANDALONE
    enabled: true
-  # ElasticSearch 6设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
 #cas单点登录
 cas:
  prefixUrl: http://cas.example.org:8443/cas
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-kingbase8.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-kingbase8.yml
@ -1,7 +1,11 @@
 server:
  port: 8080
-  tomcat:
-    max-swallow-size: -1
+  undertow:
+    # max-http-post-size: 10MB # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1
+    worker-threads: 16  # 4核CPU标准配置
+    buffers:
+      websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB
+      io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -20,7 +24,6 @@ management:
        include: metrics,httptrace-new

 spring:
-  # flyway配置
  flyway:
    # 是否启用flyway
    enabled: false
@ -35,12 +38,8 @@ spring:
    username: jeecgos@163.com
    password: ??
    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+      mail.smtp.auth: true
+      smtp.ssl.enable: true
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
@ -181,6 +180,15 @@ jeecg:
    apiKey: ??
    apiHost: https://api.deepseek.com
    timeout: 60
+  # AIRag向量库
+  ai-rag:
+    embed-store:
+      host: 127.0.0.1
+      port: 5432
+      database: postgres
+      user: postgres
+      password: postgres
+      table: embeddings
  # 平台上线安全配置
  firewall:
    # 数据源安全 (开启后，Online报表和图表的数据源为必填)
@ -210,11 +218,6 @@ jeecg:
    secretKey: ??
    endpoint: oss-cn-beijing.aliyuncs.com
    bucketName: jeecgdev
-  # ElasticSearch 6设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
  # 在线预览文件服务器地址配置
  file-view-domain: http://fileview.jeecg.com
  # minio文件上传
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
@ -1,12 +1,7 @@
 server:
  port: 8080
  undertow:
-    # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1
-    #    max-http-post-size: 10MB
-    worker-threads: 16 # 4核CPU标准配置
-    buffers:
-      websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB
-      io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB
+    worker-threads: 16
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -25,27 +20,9 @@ management:
        include: metrics,httpexchanges,jeecghttptrace

 spring:
-  # flyway配置
  flyway:
    # 是否启用flyway
-    enabled: false
-    # 编码格式，默认UTF-8
-    encoding: UTF-8
-    # 迁移sql脚本文件存放路径，官方默认db/migration
-    locations: classpath:flyway/sql/mysql
-    # 迁移sql脚本文件名称的前缀，默认V
-    sql-migration-prefix: V
-    # 迁移sql脚本文件名称的分隔符，默认2个下划线__
-    sql-migration-separator: __
-    # 避免带${}sql执行失败
-    placeholder-prefix: '#('
-    placeholder-suffix: )
-    # 迁移sql脚本文件名称的后缀
-    sql-migration-suffixes: .sql
-    # 迁移时是否进行校验，默认true
-    validate-on-migrate: true
-    # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
-    baseline-on-migrate: true
+    enabled: true
    # 是否关闭要清除已有库下的表功能,生产环境必须为true,否则会删库，非常重要！！！
    clean-disabled: true
  servlet:
@ -59,12 +36,8 @@ spring:
    username: jeecgos@163.com
    password: ??
    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+      mail.smtp.auth: true
+      smtp.ssl.enable: true
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
@ -211,6 +184,15 @@ jeecg:
    apiKey: ??
    apiHost: https://api.deepseek.com
    timeout: 60
+  # AIRag向量库
+  ai-rag:
+    embed-store:
+      host: 127.0.0.1
+      port: 5432
+      database: postgres
+      user: postgres
+      password: postgres
+      table: embeddings
  # 平台上线安全配置
  firewall:
    # 数据源安全 (开启后，Online报表和图表的数据源为必填)
@ -253,11 +235,7 @@ jeecg:
        SMS_465391221:
        # 注册账号短信模板编码
        SMS_175430166:
-  # ElasticSearch 设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
+        SMS_461885023:
  # 在线预览文件服务器地址配置
  file-view-domain: http://fileview.jeecg.com
  # minio文件上传
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
@ -1,12 +1,7 @@
 server:
  port: 8080
  undertow:
-    # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1
-    #    max-http-post-size: 10MB
-    worker-threads: 16 # 4核CPU标准配置
-    buffers:
-      websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB
-      io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB
+    worker-threads: 16
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -25,27 +20,11 @@ management:
        include: metrics,httpexchanges,jeecghttptrace

 spring:
-  # flyway配置
  flyway:
    # 是否启用flyway
-    enabled: false
-    # 编码格式，默认UTF-8
-    encoding: UTF-8
-    # 迁移sql脚本文件存放路径，官方默认db/migration
+    enabled: true
+    # 迁移sql脚本存放路径
    locations: classpath:flyway/sql/mysql
-    # 迁移sql脚本文件名称的前缀，默认V
-    sql-migration-prefix: V
-    # 迁移sql脚本文件名称的分隔符，默认2个下划线__
-    sql-migration-separator: __
-    # 避免带${}sql执行失败
-    placeholder-prefix: '#('
-    placeholder-suffix: )
-    # 迁移sql脚本文件名称的后缀
-    sql-migration-suffixes: .sql
-    # 迁移时是否进行校验，默认true
-    validate-on-migrate: true
-    # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
-    baseline-on-migrate: true
    # 是否关闭要清除已有库下的表功能,生产环境必须为true,否则会删库，非常重要！！！
    clean-disabled: true
  servlet:
@ -59,12 +38,9 @@ spring:
    username: jeecgos@163.com
    password: ??
    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+      mail.smtp.auth: true
+      smtp.ssl.enable: true
+      mail.debug: true  # 启用调试模式(查看详细日志)
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
@ -211,6 +187,15 @@ jeecg:
    apiKey: ??
    apiHost: https://api.deepseek.com
    timeout: 60
+  # AIRag向量库
+  ai-rag:
+    embed-store:
+      host: 127.0.0.1
+      port: 5432
+      database: postgres
+      user: postgres
+      password: postgres
+      table: embeddings
  # 平台上线安全配置
  firewall:
    # 数据源安全 (开启后，Online报表和图表的数据源为必填)
@ -293,11 +278,6 @@ jeecg:
    app-id: ??
    api-key: ??
    secret-key: ??
-  # ElasticSearch 设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: 192.168.1.188:9200
-    check-enabled: false
 #Mybatis输出sql日志
 logging:
  level:
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt
@ -9,7 +9,7 @@ ${AnsiColor.BRIGHT_BLUE}


 ${AnsiColor.BRIGHT_GREEN}
-Jeecg  Boot Version: 3.7.3
+Jeecg  Boot Version: 3.8.0
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
 产品官网： www.jeecg.com
 版权所属： 北京国炬信息技术有限公司
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/README.md
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/README.md
@ -7,12 +7,20 @@ V20240104_1__easyoa_add_field_attendance.sql
 R__202402_drag_update_template.sql
 ```

-### SQL命名规则说明
+### 一、SQL命名规则说明
 - 1.仅需要执行一次的，以大写“V”开头
 - 2.需要执行多次的，以大写“R”开头，命名如R__clean.sql，R的脚本只要改变了就会执行
 - 3.V开头的比R开头的优先级要高。
+- 4.参考博客：https://blog.csdn.net/Jiao1225/article/details/129590660

-
-### 命名规则示例
-参考博客：
-https://blog.csdn.net/Jiao1225/article/details/129590660
+### 二、归档增量SQL
+- 1.将目录下的所有SQL文件压缩归档至`backup`目录下
+```
+  目录：`jeecg-system-start\src\main\resources\flyway\sql\mysql`
+```
+- 2.执行SQL
+```
+-- 删除历史增量执行日志
+delete from flyway_schema_history where installed_rank > 1;
+```
+- 3.这样就清爽了，可以开启项目新起点
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/R__370_missingPermission.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/R__370_missingPermission.sql
@ -1,5 +0,0 @@
-- 补充缺少的请求权限配置
-
-INSERT IGNORE  INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('f15543b0263cf6c5fac85afdd3eba3f2', '3f915b2769fc80648e92d04e84ca059d', '用户导入', '', NULL, 0, NULL, NULL, 2, 'system:user:import', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2019-05-13 19:15:27', 'admin', '2022-06-30 15:05:12', 0, 0, '1', 0);
-INSERT IGNORE  INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1801954937339428865', '1460888189937176577', '测试数据源连接', NULL, NULL, 0, NULL, NULL, 2, 'online:report:testConnection', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-06-15 20:28:30', NULL, NULL, 0, 0, '1', 0);
-INSERT IGNORE  INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1535227149789184001', '1455101470794850305', '新建SQL增强', NULL, NULL, 0, NULL, NULL, 2, 'online:form:enhanceSql:save', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2022-06-10 19:47:30', 'admin', '2022-06-30 13:42:36', 0, 0, '1', 0);
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.6.2__all_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.6.2__all_upgrade.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.6.3__all_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.6.3__all_upgrade.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.0__all_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.0__all_upgrade.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.12__jimu_dashboard_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.12__jimu_dashboard_upgrade.sql
@ -1,20 +0,0 @@
-
-ALTER TABLE `onl_drag_dataset_item`
-ADD COLUMN `dict_table` varchar(125) NULL AFTER `dict_code`,
-ADD COLUMN `dict_text` varchar(125) NULL AFTER `dict_table`;
-
-
-- 仪表盘默认文件夹目录树---
-INSERT INTO `jimu_report_category`(`id`, `name`, `parent_id`, `iz_leaf`, `source_type`, `create_by`, `create_time`, `update_by`, `update_time`, `tenant_id`, `del_flag`) VALUES ('988299668956545024', '仪表盘设计', '0', 1, 'drag', '15931993294', '2024-08-27', '15931993294', '2024-08-28', NULL, 0);
-INSERT INTO `jimu_report_category`(`id`, `name`, `parent_id`, `iz_leaf`, `source_type`, `create_by`, `create_time`, `update_by`, `update_time`, `tenant_id`, `del_flag`) VALUES ('988299695309357056', '门户设计', '0', 1, 'drag', '15931993294', '2024-08-27', '15931993294', '2024-08-27', NULL, 0);
-
-
-ALTER TABLE `onl_drag_page`
-MODIFY COLUMN `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属分类' AFTER `protection_code`;
-UPDATE `onl_drag_page` SET `type` = '988299668956545024' WHERE `type` = '1';
-UPDATE `onl_drag_page` SET `type` = '988299695309357056' WHERE `type` = '2';
-
-
-INSERT INTO `onl_drag_comp` (`id`, `parent_id`, `comp_name`, `comp_type`, `icon`, `order_num`, `type_id`, `comp_config`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1537773244027863041', '1537773378102984706', '圆形雷达图', 'JCircleRadar', 'tabler:radar', 100, NULL, '{\r\n  \"w\": 12,\r\n  \"h\": 30,\n  \"dataType\": 1,\n  \"url\": \"http://api.jeecg.com/mock/33/radar\",\n  \"timeOut\": 0,\n  \"turnConfig\": {\n    \"url\": \"\"\n  },\n  \"linkageConfig\": [],\n  \"dataMapping\": [\n    {\n      \"filed\": \"分组\",\n      \"mapping\": \"\"\n    },\n    {\n      \"filed\": \"维度\",\n      \"mapping\": \"\"\n    },\n    {\n      \"filed\": \"数值\",\n      \"mapping\": \"\"\n    }\n  ],\n  \"chartData\": [\n    {\n      \"value\": 75,\n      \"name\": \"得分\",\n      \"type\": \"NBA\",\n      \"max\": 100\n    },\n    {\n      \"value\": 65,\n      \"name\": \"篮板\",\n      \"type\": \"NBA\",\n      \"max\": 100\n    },\n    {\n      \"value\": 55,\n      \"name\": \"防守\",\n      \"type\": \"NBA\",\n      \"max\": 100\n    },\n    {\n      \"value\": 74,\n      \"name\": \"失误\",\n      \"type\": \"NBA\",\n      \"max\": 100\n    },\n    {\n      \"value\": 38,\n      \"name\": \"盖帽\",\n      \"type\": \"NBA\",\n      \"max\": 100\n    },\n    {\n      \"value\": 88,\n      \"name\": \"三分\",\n      \"type\": \"NBA\",\n      \"max\": 100\n    }\n  ],\n  \"option\": {\n    \"grid\": {\n      \"show\": false,\n      \"bottom\": 115\n    },\n    \"card\": {\n      \"title\": \"\",\n      \"extra\": \"\",\n      \"rightHref\": \"\",\n      \"size\": \"default\"\n    },\n    \"title\": {\n      \"text\": \"圆形雷达图\",\r\n     \"textStyle\":{\r\n       \"fontWeight\":\"normal\"\r\n     },\n      \"show\": true\n    },\n    \"legend\": {\n      \"data\": []\n    },\n    \"radar\": [\n      {\n        \"indicator\": []\n      }\n    ],\n    \"series\": [\n      {\n        \"type\": \"radar\",\n        \"data\": []\n      }\n    ]\n  }\n}', '1', NULL, '2022-06-17 20:24:46', NULL, '2022-06-27 16:56:51');
-INSERT INTO `onl_drag_comp` (`id`, `parent_id`, `comp_name`, `comp_type`, `icon`, `order_num`, `type_id`, `comp_config`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1537318433201340417', '1537764868216684545', '金字塔漏斗图', 'JPyramidFunnel', 'icon-park-outline:children-pyramid', 100, NULL, '{\r\n  \"w\": 12,\r\n  \"h\": 30,\n  \"dataType\": 1,\n  \"url\": \"http://api.jeecg.com/mock/26/funnel\",\n  \"timeOut\": 0,\n  \"turnConfig\": {\n    \"url\": \"\"\n  },\n  \"linkageConfig\": [],\n  \"dataMapping\": [\n    {\n      \"filed\": \"维度\",\n      \"mapping\": \"\"\n    },\n    {\n      \"filed\": \"数值\",\n      \"mapping\": \"\"\n    }\n  ],\n  \"chartData\": [\n    {\n      \"value\": 1000,\n      \"name\": \"直接访问\"\n    },\n    {\n      \"value\": 200,\n      \"name\": \"邮件营销\"\n    },\n    {\n      \"value\": 400,\n      \"name\": \"联盟广告\"\n    },\n    {\n      \"value\": 600,\n      \"name\": \"网页查询\"\n    },\n    {\n      \"value\": 800,\n      \"name\": \"广告点击\"\n    }\n  ],\n  \"option\": {\n    \"title\": {\n      \"text\": \"基础漏斗图\",\r\n      \"textStyle\":{\r\n       \"fontWeight\":\"normal\"\r\n     },\n      \"show\": true\n    },\n    \"grid\": {\n      \"bottom\": 115\n    },\n    \"card\": {\n      \"title\": \"\",\n      \"extra\": \"\",\n      \"rightHref\": \"\",\n      \"size\": \"default\"\n    },\n    \"tooltip\": {\n      \"trigger\": \"item\",\n      \"formatter\": \"{a} <br/>{b} : {c}%\"\n    },\n    \"legend\": {\n      \"orient\": \"horizontal\"\n    },\n    \"series\": [\n      {\n        \"name\": \"Funnel\",\n        \"type\": \"funnel\",\n        \"left\": \"10%\",\n        \"width\": \"80%\",\n        \"sort\": \"ascending\",\n        \"gap\": 2,\n        \"label\": {\n          \"show\": true,\n          \"position\": \"inside\"\n        },\n        \"labelLine\": {\n          \"length\": 10,\n          \"lineStyle\": {\n            \"width\": 1,\n            \"type\": \"solid\"\n          }\n        },\n        \"itemStyle\": {\n          \"borderColor\": \"#fff\",\n          \"borderWidth\": 1\n        },\n        \"emphasis\": {\n          \"label\": {\n            \"fontSize\": 20\n          }\n        }\n      }\n    ]\n  }\n}', '1', NULL, '2022-06-16 14:17:31', NULL, '2022-06-16 14:59:44');
-INSERT INTO `onl_drag_comp` (`id`, `parent_id`, `comp_name`, `comp_type`, `icon`, `order_num`, `type_id`, `comp_config`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('100100', '100', '查询条件', 'JForm', 'ant-design:form-outlined', 1, NULL, '{\n  \"w\": 24,\n  \"h\": 12,\n  \"dataType\": 1,\n  \"timeOut\": -1,\n  \"option\": {}\n}', '1', NULL, NULL, 'jeecg', '2022-04-29 18:55:15');
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.1__all_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.1__all_upgrade.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.20__system_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.20__system_upgrade.sql
@ -1,9 +0,0 @@
-- ---author:wangshuai---date:20241108-----for: 修改字段变更为为钉钉企业id---
-ALTER TABLE sys_third_app_config
-    CHANGE COLUMN agent_app_secret corp_id varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉企业id' AFTER client_secret;
-
-UPDATE `sys_gateway_route` SET  `predicates` = '[{\"args\":[\"/websocket/**\",\"/eoaSocket/**\",\"/newsWebsocket/**\",\"/dragChannelSocket/**\"],\"name\":\"Path\"}]' WHERE `id` = 'jeecg-cloud-websocket';
-
-- ---author:sunjianlei---date:20240930-----for: 【TV360X-2604】【Online表单】按钮权限未激活时增加提示，添加查询索引 ---
-ALTER TABLE onl_auth_page ADD INDEX idx_onl_auth_page_code(code);
-ALTER TABLE onl_auth_page ADD INDEX idx_onl_auth_page_cgform_id(cgform_id);
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.21__jimureport_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.21__jimureport_upgrade.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.22__jimureport_upgrade1.9.3.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.22__jimureport_upgrade1.9.3.sql
@ -1,3 +0,0 @@
-- 升级积木BI到最新版
-UPDATE onl_drag_comp SET status='0' WHERE parent_id = '0';
-update onl_drag_page set type =0 where iz_template = '1';
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.30__all_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.30__all_upgrade.sql
@ -1,5 +0,0 @@
-- -author:chenrui---date:2025/1/16-----for:[QQYUN-10935]【jeecg】租户套餐管理优化---
-UPDATE `sys_permission` SET `parent_id` = 'd7d6e2e4e2934f2c9385a623fd98c6f3', `name` = '租户初始套餐' WHERE `id` = '1668174661456171010';
-
-- -- author:chenrui---date:20250206--for: [QQYUN-11032]【jeecg】租户套餐管理增加初始化套餐包按钮 ---
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1887447660072292354', '1280350452934307841', '初始化套餐包', NULL, NULL, 0, NULL, NULL, 2, 'system:tenant:syncDefaultPack', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'jeecg', '2025-02-06 18:26:04', 'jeecg', '2025-02-06 18:26:53', 0, 0, '1', 0);
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.31__jimureport_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.31__jimureport_upgrade.sql
@ -1,20 +0,0 @@
-ALTER TABLE `jimu_report_db_field`
-    ADD COLUMN `field_name_physics` varchar(200) NULL COMMENT '物理字段名（文件数据集使用，存的是excel的字段标题）' AFTER `field_name`;
-
-CREATE TABLE `jimu_report_icon_lib` (
-    `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
-    `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片名称',
-    `type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片类型',
-    `image_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图片地址',
-    `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-    `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '更新人',
-    `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-    `tenant_id` int(11) DEFAULT NULL COMMENT '租户id',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='积木图库表';
-
-INSERT INTO `jimu_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `tenant_id`) VALUES ('1047797573274468352', '系统图库', 'gallery', '', 0, 'admin', '2025-02-07 19:00:19', NULL, NULL, 0, '1');
-INSERT INTO `jimu_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1047797624512086016', '1047797573274468352', '常规', 'common', NULL, 1, 1, 'admin', '2025-02-07 19:00:31', NULL, NULL);
-INSERT INTO `jimu_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1047797669877678080', '1047797573274468352', '指向', 'point', NULL, 1, 1, 'admin', '2025-02-07 19:00:42', '15931993294', '2025-02-07 19:01:11');
-INSERT INTO `jimu_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1047797751893098496', '1047797573274468352', '专业', 'major', NULL, 1, 1, 'admin', '2025-02-07 19:01:01', NULL, NULL);
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.32__jimureport_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.32__jimureport_upgrade.sql
@ -1,2 +0,0 @@
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1876220177009315842', '1473927410093187073', '表单设计页面查询', NULL, NULL, 0, NULL, NULL, 2, 'drag:design:getTotalData', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-01-06 18:52:03', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) VALUES ('1892117657990971393', '1456165677820301314', '1876220177009315842', NULL, '2025-02-19 15:42:58', '0:0:0:0:0:0:0:1');
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.0_0__clear_flyway_sql.md
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.0_0__clear_flyway_sql.md
@ -0,0 +1,3 @@
+-- v3.8.0版本归档了历史增量SQL，启动报错！请手工执行下面SQL，清空flyway_schema历史
+CREATE TABLE flyway_schema_history_1 AS SELECT * FROM flyway_schema_history;
+delete from flyway_schema_history where installed_rank > 1;
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.0_1__airag_add_menu.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.0_1__airag_add_menu.sql
@ -0,0 +1,7 @@
+-- 菜单配置
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1890213291321749505', '1892553163993931777', 'AI流程设计', '/process/list/airag', 'super/airag/aiflow/pages/ProcessList', 1, '', NULL, 1, NULL, '0', 3.00, 0, 'ant-design:box-plot-outlined', 1, 0, 0, 0, NULL, 'admin', '2025-02-14 09:35:41', 'admin', '2025-03-06 20:31:08', 0, 0, NULL, 0);
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1892553163993931777', '', 'AI大模型', '/airag', 'layouts/default/index', 1, '', NULL, 0, NULL, '0', 1.00, 0, 'ant-design:box-plot-outlined', 0, 0, 0, 0, NULL, 'admin', '2025-02-20 20:33:31', 'admin', '2025-02-20 20:35:19', 0, 0, NULL, 0);
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1892553778493022209', '1892553163993931777', 'AI模型配置', '/super/airag/aimodel/AiModelList', 'super/airag/aimodel/AiModelList', 1, '', NULL, 1, NULL, '0', 4.00, 0, 'ant-design:setting-twotone', 1, 0, 0, 0, NULL, 'admin', '2025-02-20 20:35:57', 'admin', '2025-03-06 20:31:13', 0, 0, NULL, 0);
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1892557342028226561', '1892553163993931777', 'AI知识库', '/super/airag/aiknowledge/AiKnowledgeBaseList', 'super/airag/aiknowledge/AiKnowledgeBaseList', 1, '', NULL, 1, NULL, '0', 2.00, 0, 'ant-design:book-twotone', 1, 0, 0, 0, NULL, 'admin', '2025-02-20 20:50:07', 'admin', '2025-02-23 17:39:01', 0, 0, NULL, 0);
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1893865471550578689', '1892553163993931777', 'AI应用管理', '/super/airag/aiapp/AiAppList', 'super/airag/aiapp/AiAppList', 1, '', NULL, 1, NULL, '0', 1.00, 0, 'ant-design:appstore-twotone', 1, 0, 0, 0, NULL, 'admin', '2025-02-24 11:28:09', 'admin', '2025-03-06 20:30:58', 0, 0, NULL, 0);
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1895401981290643458', '1892553163993931777', 'AI聊天', '/super/airag/aiapp/chat/AiChat', 'super/airag/aiapp/chat/AiChat', 1, '', NULL, 1, NULL, '0', 5.00, 0, 'ant-design:aliwangwang-outlined', 1, 0, 1, 0, NULL, 'admin', '2025-02-28 17:13:42', 'admin', '2025-02-28 17:30:40', 0, 0, NULL, 0);
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.0_2__airag_init_db.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.0_2__airag_init_db.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/backup/V20240403.zip
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/backup/V20240403.zip
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/TestMain.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/TestMain.java
@ -1,47 +1,47 @@
-//package org.jeecg;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import org.jeecg.common.util.RestUtil;
-//import org.springframework.http.HttpHeaders;
-//import org.springframework.http.HttpMethod;
-//import org.springframework.http.MediaType;
-//import org.springframework.http.ResponseEntity;
-//
-///**
-// * @Description: TODO
-// * @author: scott
-// * @date: 2022年05月10日 14:02
-// */
-//public class TestMain {
-//    public static void main(String[] args) {
-//        // 请求地址
-//        String url = "https://api.boot.jeecg.com/sys/user/list";
-//        // 请求 Header （用于传递Token）
-//        HttpHeaders headers = getHeaders();
-//        // 请求方式是 GET 代表获取数据
-//        HttpMethod method = HttpMethod.GET;
-//
-//        System.out.println("请求地址：" + url);
-//        System.out.println("请求方式：" + method);
-//
-//        // 利用 RestUtil 请求该url
-//        ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-//        if (result != null && result.getBody() != null) {
-//            System.out.println("返回结果：" + result.getBody().toJSONString());
-//        } else {
-//            System.out.println("查询失败");
-//        }
-//    }
-//    private static HttpHeaders getHeaders() {
-//        String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.50h-g6INOZRVnznExiawFb1U6PPjcVVA4POeYRA5a5Q";
-//        System.out.println("请求Token：" + token);
-//
-//        HttpHeaders headers = new HttpHeaders();
-//        String mediaType = MediaType.APPLICATION_JSON_VALUE;
-//        headers.setContentType(MediaType.parseMediaType(mediaType));
-//        headers.set("Accept", mediaType);
-//        headers.set("X-Access-Token", token);
-//        return headers;
-//    }
-//
-//}
+package org.jeecg;
+
+import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.util.RestUtil;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * @Description: TODO
+ * @author: scott
+ * @date: 2022年05月10日 14:02
+ */
+public class TestMain {
+    public static void main(String[] args) {
+        // 请求地址
+        String url = "https://api3.boot.jeecg.com/sys/user/list";
+        // 请求 Header （用于传递Token）
+        HttpHeaders headers = getHeaders();
+        // 请求方式是 GET 代表获取数据
+        HttpMethod method = HttpMethod.GET;
+
+        System.out.println("请求地址：" + url);
+        System.out.println("请求方式：" + method);
+
+        // 利用 RestUtil 请求该url
+        ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
+        if (result != null && result.getBody() != null) {
+            System.out.println("返回结果：" + result.getBody().toJSONString());
+        } else {
+            System.out.println("查询失败");
+        }
+    }
+    private static HttpHeaders getHeaders() {
+        String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.50h-g6INOZRVnznExiawFb1U6PPjcVVA4POeYRA5a5Q";
+        System.out.println("请求Token：" + token);
+
+        HttpHeaders headers = new HttpHeaders();
+        String mediaType = MediaType.APPLICATION_JSON_VALUE;
+        headers.setContentType(MediaType.parseMediaType(mediaType));
+        headers.set("Accept", mediaType);
+        headers.set("X-Access-Token", token);
+        return headers;
+    }
+
+}
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/message/test/SendMessageTest.java
@ -14,11 +14,9 @@ import org.jeecg.common.constant.enums.MessageTypeEnum;
 import org.jeecg.common.constant.enums.SysAnnmentTypeEnum;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.util.DySmsHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;

 import java.util.HashMap;
 import java.util.Map;
@ -27,7 +25,6 @@ import java.util.Map;
 * @Description: 消息推送测试
 * @Author: lsq
 */
-@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class)
 public class SendMessageTest {

--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/InsertDemoTest.java
@ -1,86 +0,0 @@
-package org.jeecg.modules.system.test;
-
-import com.alibaba.fastjson.JSONObject;
-import org.jeecg.JeecgSystemApplication;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.RestUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * 系统用户单元测试
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
-public class InsertDemoTest {
-    /**
-     * 测试地址：实际使用时替换成你自己的地址
-     */
-    private final String BASE_URL = "http://localhost:8080/jeecg-boot//test/jeecgDemo/";
-    //测试：用户名和密码
-    private final String USERNAME = "admin";
-    private final String PASSWORD = "123456";
-    @Autowired
-    private RedisUtil redisUtil;
-
-    /**
-     * 测试用例：新增
-     */
-    @Test
-    public void testAdd() {
-        // 请求地址
-        String url = BASE_URL + "add" ;
-        // 请求 Header （用于传递Token）
-        HttpHeaders headers = this.getHeaders();
-        // 请求方式是 POST 代表提交新增数据
-        HttpMethod method = HttpMethod.POST;
-
-        System.out.println("请求地址：" + url);
-        System.out.println("请求方式：" + method);
-
-        
-        for (int i = 0; i < 100; i++) {
-            String name = "李哈哈" + i;
-            JSONObject params = new JSONObject();
-            params.put("name", name);
-            System.out.println("请求参数：" + params.toJSONString());
-
-            // 利用 RestUtil 请求该url
-            ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-            if (result != null && result.getBody() != null) {
-                System.out.println("返回结果：" + result.getBody().toJSONString());
-            } else {
-                System.out.println("查询失败");
-            }
-        }
-    }
-
-
-    private String getToken() {
-        String token = JwtUtil.sign(USERNAME, PASSWORD);
-        redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-        redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60);
-        return token;
-    }
-
-    private HttpHeaders getHeaders() {
-        String token = this.getToken();
-        System.out.println("请求Token：" + token);
-
-        HttpHeaders headers = new HttpHeaders();
-        String mediaType = MediaType.APPLICATION_JSON_VALUE;
-        headers.setContentType(MediaType.parseMediaType(mediaType));
-        headers.set("Accept", mediaType);
-        headers.set("X-Access-Token", token);
-        return headers;
-    }
-}
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/MockControllerTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/MockControllerTest.java
@ -0,0 +1,37 @@
+package org.jeecg.modules.system.test;
+
+import org.jeecg.config.JeecgBaseConfig;
+import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.demo.mock.MockController;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+/**
+ * 单个controller测试
+ * @date 2025/4/7 11:21
+ */
+@WebMvcTest(value = MockController.class)
+public class MockControllerTest {
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private BaseCommonService baseCommonService;
+    @MockBean
+    private JeecgBaseConfig jeecgBaseConfig;
+
+    @Test
+    public void testSave() throws Exception {
+        mockMvc.perform(get("/mock/api/json/area"))
+                .andDo(MockMvcResultHandlers.print())
+                .andExpect(MockMvcResultMatchers.status().isOk());
+    }
+
+}
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SampleTest.java
@ -6,16 +6,12 @@ import org.jeecg.modules.demo.test.entity.JeecgDemo;
 import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
 import org.jeecg.modules.demo.test.service.IJeecgDemoService;
 import org.jeecg.modules.system.service.ISysDataLogService;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import jakarta.annotation.Resource;
+import org.springframework.util.Assert;
+import javax.annotation.Resource;
 import java.util.List;

-@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
 public class SampleTest {

@ -32,7 +28,7 @@ public class SampleTest {
 	public void testSelect() {
 		System.out.println(("----- selectAll method test ------"));
 		List<JeecgDemo> userList = jeecgDemoMapper.selectList(null);
-		Assert.assertEquals(5, userList.size());
+		Assert.isTrue(15==userList.size(),"结果不是5条");
 		userList.forEach(System.out::println);
 	}

--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysTableWhiteCheckTest.java
@ -1,21 +1,19 @@
 package org.jeecg.modules.system.test;

+import org.aspectj.lang.annotation.Before;
 import org.jeecg.JeecgSystemApplication;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.config.JeecgBaseConfig;
 import org.jeecg.config.firewall.SqlInjection.IDictTableWhiteListHandler;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;

 /**
 * @Description: 系统表白名单测试
 * @Author: sunjianlei
 */
-@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class)
 public class SysTableWhiteCheckTest {

@ -27,7 +25,7 @@ public class SysTableWhiteCheckTest {
    @Autowired
    JeecgBaseConfig jeecgBaseConfig;

-    @Before
+    @BeforeEach
    public void before() {
        String lowCodeMode = this.jeecgBaseConfig.getFirewall().getLowCodeMode();
        System.out.println("当前 LowCode 模式为: " + lowCodeMode);
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserApiTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserApiTest.java
@ -0,0 +1,177 @@
+package org.jeecg.modules.system.test;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.modules.redis.client.JeecgRedisClient;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.config.JeecgBaseConfig;
+import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.system.controller.SysUserController;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+
+/**
+ * 系统用户单元测试
+ */
+@WebMvcTest(SysUserController.class)
+public class SysUserApiTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private ISysUserService sysUserService;
+
+    @MockBean
+    private ISysDepartService sysDepartService;
+
+    @MockBean
+    private ISysUserRoleService sysUserRoleService;
+
+    @MockBean
+    private ISysUserDepartService sysUserDepartService;
+
+    @MockBean
+    private ISysDepartRoleUserService departRoleUserService;
+
+    @MockBean
+    private ISysDepartRoleService departRoleService;
+
+    @MockBean
+    private RedisUtil redisUtil;
+
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+
+    @MockBean
+    private BaseCommonService baseCommonService;
+
+    @MockBean
+    private ISysUserAgentService sysUserAgentService;
+
+    @MockBean
+    private ISysPositionService sysPositionService;
+
+    @MockBean
+    private ISysUserTenantService userTenantService;
+
+    @MockBean
+    private JeecgRedisClient jeecgRedisClient;
+
+    @MockBean
+    private JeecgBaseConfig jeecgBaseConfig;
+    /**
+     * 测试地址：实际使用时替换成你自己的地址
+     */
+    private final String BASE_URL = "/sys/user/";
+
+    /**
+     * 测试用例：查询记录
+     */
+    @Test
+    public void testQuery() throws Exception{
+        // 请求地址
+        String url = BASE_URL + "list";
+
+        Page<SysUser> sysUserPage = new Page<>();
+        SysUser sysUser = new SysUser();
+        sysUser.setUsername("admin");
+        List<SysUser> users = new ArrayList<>();
+        users.add(sysUser);
+        sysUserPage.setRecords(users);
+        sysUserPage.setCurrent(1);
+        sysUserPage.setSize(10);
+        sysUserPage.setTotal(1);
+
+        given(this.sysUserService.queryPageList(any(), any(), any(), any())).willReturn(Result.OK(sysUserPage));
+
+        String result = mockMvc.perform(get(url)).andReturn().getResponse().getContentAsString();
+        JSONObject jsonObject = JSON.parseObject(result);
+        Assertions.assertEquals("admin", jsonObject.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("username"));
+    }
+
+    /**
+     * 测试用例：新增
+     */
+    @Test
+    public void testAdd() throws Exception {
+        // 请求地址
+        String url = BASE_URL + "add" ;
+
+        JSONObject params = new JSONObject();
+        params.put("username", "wangwuTest");
+        params.put("password", "123456");
+        params.put("confirmpassword","123456");
+        params.put("realname", "单元测试");
+        params.put("activitiSync", "1");
+        params.put("userIdentity","1");
+        params.put("workNo","0025");
+
+        String result = mockMvc.perform(post(url).contentType(MediaType.APPLICATION_JSON_VALUE).content(params.toJSONString()))
+                .andReturn().getResponse().getContentAsString();
+        JSONObject jsonObject = JSON.parseObject(result);
+        Assertions.assertTrue(jsonObject.getBoolean("success"));
+    }
+
+
+    /**
+     * 测试用例：修改
+     */
+    @Test
+    public void testEdit() throws Exception {
+        // 数据Id
+        String dataId = "1331795062924374018";
+        // 请求地址
+        String url = BASE_URL + "edit";
+
+        JSONObject params = new JSONObject();
+        params.put("username", "wangwuTest");
+        params.put("realname", "单元测试1111");
+        params.put("activitiSync", "1");
+        params.put("userIdentity","1");
+        params.put("workNo","0025");
+        params.put("id",dataId);
+
+        SysUser sysUser = new SysUser();
+        sysUser.setUsername("admin");
+
+        given(this.sysUserService.getById(any())).willReturn(sysUser);
+
+        String result = mockMvc.perform(put(url).contentType(MediaType.APPLICATION_JSON_VALUE).content(params.toJSONString()))
+                .andReturn().getResponse().getContentAsString();
+        JSONObject jsonObject = JSON.parseObject(result);
+        Assertions.assertTrue(jsonObject.getBoolean("success"));
+    }
+
+
+    /**
+     * 测试用例：删除
+     */
+    @Test
+    public void testDelete() throws Exception {
+        // 数据Id
+        String dataId = "1331795062924374018";
+        // 请求地址
+        String url = BASE_URL + "delete" + "?id=" + dataId;
+        String result = mockMvc.perform(delete(url)).andReturn().getResponse().getContentAsString();
+        JSONObject jsonObject = JSON.parseObject(result);
+        Assertions.assertTrue(jsonObject.getBoolean("success"));
+    }
+}
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
@ -1,177 +0,0 @@
-package org.jeecg.modules.system.test;
-
-import com.alibaba.fastjson.JSONObject;
-import org.jeecg.JeecgSystemApplication;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.RestUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * 系统用户单元测试
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
-public class SysUserTest {
-    /**
-     * 测试地址：实际使用时替换成你自己的地址
-     */
-    private final String BASE_URL = "http://localhost:8080/jeecg-boot/sys/user/";
-    //测试：用户名和密码
-    private final String USERNAME = "admin";
-    private final String PASSWORD = "123456";
-    @Autowired
-    private RedisUtil redisUtil;
-
-    /**
-     * 测试用例：查询记录
-     */
-    @Test
-    public void testQuery() {
-        // 请求地址
-        String url = BASE_URL + "list";
-        // 请求 Header （用于传递Token）
-        HttpHeaders headers = this.getHeaders();
-        // 请求方式是 GET 代表获取数据
-        HttpMethod method = HttpMethod.GET;
-
-        System.out.println("请求地址：" + url);
-        System.out.println("请求方式：" + method);
-
-        // 利用 RestUtil 请求该url
-        ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果：" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
-    }
-
-    /**
-     * 测试用例：新增
-     */
-    @Test
-    public void testAdd() {
-        // 请求地址
-        String url = BASE_URL + "add" ;
-        // 请求 Header （用于传递Token）
-        HttpHeaders headers = this.getHeaders();
-        // 请求方式是 POST 代表提交新增数据
-        HttpMethod method = HttpMethod.POST;
-
-        System.out.println("请求地址：" + url);
-        System.out.println("请求方式：" + method);
-
-        JSONObject params = new JSONObject();
-        params.put("username", "wangwuTest");
-        params.put("password", "123456");
-        params.put("confirmpassword","123456");
-        params.put("realname", "单元测试");
-        params.put("activitiSync", "1");
-        params.put("userIdentity","1");
-        params.put("workNo","0025");
-
-        System.out.println("请求参数：" + params.toJSONString());
-
-        // 利用 RestUtil 请求该url
-        ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果：" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
-    }
-
-
-    /**
-     * 测试用例：修改
-     */
-    @Test
-    public void testEdit() {
-        // 数据Id
-        String dataId = "1331795062924374018";
-        // 请求地址
-        String url = BASE_URL + "edit";
-        // 请求 Header （用于传递Token）
-        HttpHeaders headers = this.getHeaders();
-        // 请求方式是 PUT 代表提交修改数据
-        HttpMethod method = HttpMethod.PUT;
-
-        System.out.println("请求地址：" + url);
-        System.out.println("请求方式：" + method);
-
-        JSONObject params = new JSONObject();
-        params.put("username", "wangwuTest");
-        params.put("realname", "单元测试1111");
-        params.put("activitiSync", "1");
-        params.put("userIdentity","1");
-        params.put("workNo","0025");
-        params.put("id",dataId);
-
-        System.out.println("请求参数：" + params.toJSONString());
-
-        // 利用 RestUtil 请求该url
-        ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果：" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
-    }
-
-
-    /**
-     * 测试用例：删除
-     */
-    @Test
-    public void testDelete() {
-        // 数据Id
-        String dataId = "1331795062924374018";
-        // 请求地址
-        String url = BASE_URL + "delete" + "?id=" + dataId;
-        // 请求 Header （用于传递Token）
-        HttpHeaders headers = this.getHeaders();
-        // 请求方式是 DELETE 代表删除数据
-        HttpMethod method = HttpMethod.DELETE;
-
-        System.out.println("请求地址：" + url);
-        System.out.println("请求方式：" + method);
-
-        // 利用 RestUtil 请求该url
-        ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果：" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
-    }
-
-
-    private String getToken() {
-        String token = JwtUtil.sign(USERNAME, PASSWORD);
-        redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-        redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60);
-        return token;
-    }
-
-    private HttpHeaders getHeaders() {
-        String token = this.getToken();
-        System.out.println("请求Token：" + token);
-
-        HttpHeaders headers = new HttpHeaders();
-        String mediaType = MediaType.APPLICATION_JSON_VALUE;
-        headers.setContentType(MediaType.parseMediaType(mediaType));
-        headers.set("Accept", mediaType);
-        headers.set("X-Access-Token", token);
-        return headers;
-    }
-}
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestSqlHandle.java
@ -1,6 +1,7 @@
 package org.jeecg.smallTools;

-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;

 /**
 * 测试sql分割、替换等操作
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestStr.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestStr.java
@ -2,11 +2,17 @@ package org.jeecg.smallTools;

 import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.jeecg.common.util.DateUtils;
+import org.junit.jupiter.api.Test;

 import java.text.MessageFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Date;

 /**
 * 字符串处理测试
@ -37,6 +43,23 @@ public class TestStr {
        System.out.println("length = "+ conditionValueArray.length);
        Arrays.stream(conditionValueArray).forEach(System.out::println);
    }
+    
+    
+    @Test
+    public void getThisDate() {
+        LocalDate d = DateUtils.getLocalDate();
+        System.out.println(d); 
+    }
+    
+    
+    @Test
+    public void firstDayOfLastSixMonths() {
+        LocalDate today = LocalDate.now(); // 获取当前日期
+        LocalDate firstDayOfLastSixMonths = today.minusMonths(6).withDayOfMonth(1); // 获取近半年的第一天
+        LocalDateTime firstDateTime = LocalDateTime.of(firstDayOfLastSixMonths, LocalTime.MIN); // 设置时间为当天的最小时间（00:00:00）
+        Date date = Date.from(firstDateTime.atZone(ZoneId.systemDefault()).toInstant()); // 将 LocalDateTime 转换为 Date
+        System.out.println("近半年的第一天的 00:00:00 时间戳：" + date);
+    }

    @Test
    public void testJSONArrayJoin() {
@ -67,7 +90,7 @@ public class TestStr {
     */
    @Test
    public void testSpecialChar() {
-        String str = "Hello, World! 你好！这是一段特殊符号的测试，This is a test string with special characters: @#$%^&*";
+        String str = "Hello, World! 你好！这是一段特殊符号的测试，This is__ a test string with special characters: @#$%^&*";
        // 使用正则表达式替换特殊字符
        String replacedStr = str.replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]", "");
        System.out.println("Replaced String: " + replacedStr);