【v3.8.3版本发布】

Merge remote-tracking branch 'origin/springboot3' into springboot3_sas # Conflicts: # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java # 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/system/vo/LoginUser.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java # jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java # jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SystemApiController.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/SysDepartController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java # jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml # jeecg-boot/pom.xml
2026-01-03 20:35:29 +08:00 · 2025-09-24 18:24:19 +08:00
parent c4a87d7c58 80749098bd
commit 6a6d29254b
336 changed files with 12900 additions and 84893 deletions
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
@ -11,6 +11,8 @@ WORKDIR /jeecg-boot
 EXPOSE 8080

 #ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/jeecg-system-start-3.8.2.jar ./
+ADD ./target/jeecg-system-start-3.8.3.jar ./

-CMD sleep 60;java -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.8.2.jar
+RUN mkdir -p /jeecg-boot/config
+
+CMD sleep 60;java -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.8.3.jar
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml
@ -4,8 +4,8 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>jeecg-module-system</artifactId>
-        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.8.2</version>
+        <groupId>org.jeecgframework.boot3</groupId>
+        <version>3.8.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -14,13 +14,13 @@
    <dependencies>
        <!-- SYSTEM 系统管理模块 -->
        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
+            <groupId>org.jeecgframework.boot3</groupId>
            <artifactId>jeecg-system-biz</artifactId>
            <version>${jeecgboot.version}</version>
        </dependency>
        <!-- DEMO 示例模块 -->
        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
+            <groupId>org.jeecgframework.boot3</groupId>
            <artifactId>jeecg-module-demo</artifactId>
            <version>${jeecgboot.version}</version>
        </dependency>
--- 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,12 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    # 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
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -25,6 +20,9 @@ management:
        include: metrics,httpexchanges,jeecghttptrace

 spring:
+#  main:
+#    # 启动加速 (建议开发环境，开启后flyway自动升级失效)
+#    lazy-initialization: true
  flyway:
    # 是否启用flyway
    enabled: true
@ -46,7 +44,7 @@ spring:
      mail.smtp.writetimeout: 10000  # 写入超时（毫秒）
      mail.smtp.auth: true
      smtp.ssl.enable: true
-      mail.debug: true  # 启用调试模式(查看详细日志)
+#      mail.debug: true  # 启用调试模式(查看详细日志)
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
@ -180,7 +178,7 @@ mybatis-plus:
      # 默认数据库表下划线命名
      table-underline: true
  configuration:
-    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+#    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    # 返回类型为Map,显示null对应的字段
    call-setters-on-nulls: true
@ -261,6 +259,12 @@ jeecg:
      dataSourceSafe: false
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: dev
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
@ -292,6 +296,7 @@ logging:
    org.springframework.context.support.PostProcessorRegistrationDelegate: error
    org.flywaydb: debug
    org.jeecg.modules.system.mapper: info
+    org.jeecg.modules.demo.test.mapper: info
 #swagger
 knife4j:
  #开启增强配置
--- 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,12 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    # 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
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -135,7 +130,7 @@ spring:
      datasource:
        # 重点是将数据源指向oracle 用compatibleMode=oracle即可
        master:
-          url: jdbc:dm://127.0.0.1:30236/?schema=SYSDBA&compatibleMode=oracle&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+          url: jdbc:dm://127.0.0.1:30236?schema=SYSDBA&compatibleMode=oracle&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
          username: SYSDBA
          password: SYSDBA
          driverClassName: dm.jdbc.driver.DmDriver
@ -239,6 +234,12 @@ jeecg:
      dataSourceSafe: false
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: dev
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
@ -1,12 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    # 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
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -162,11 +157,12 @@ spring:
          #password: root
          #driver-class-name: com.mysql.cj.jdbc.Driver
  #redis 配置
-  redis:
-    database: 0
-    host: jeecg-boot-redis
-    port: 6379
-    password: ''
+  data:
+    redis:
+      database: 0
+      host: 127.0.0.1
+      port: 6379
+      password:
 #mybatis plus 设置
 mybatis-plus:
  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
@ -262,6 +258,12 @@ jeecg:
      dataSourceSafe: false
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: dev
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
--- 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,12 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    # 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
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -22,7 +17,7 @@ management:
  endpoints:
    web:
      exposure:
-        include: metrics,jeecghttptrace
+        include: metrics,httpexchanges,jeecghttptrace

 spring:
  flyway:
@ -254,6 +249,12 @@ jeecg:
      dataSourceSafe: false
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: dev
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-oracle.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-oracle.yml
@ -1,12 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    # 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
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -253,6 +248,12 @@ jeecg:
      dataSourceSafe: false
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: dev
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-postgresql.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-postgresql.yml
@ -1,12 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    # 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
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -266,6 +261,12 @@ jeecg:
      dataSourceSafe: false
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: dev
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
--- 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,11 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    worker-threads: 16
-    buffers:
-      websocket: 8192
-      io: 16384
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -258,6 +254,12 @@ jeecg:
      dataSourceSafe: true
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: prod
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
@ -280,7 +282,6 @@ jeecg:
    app-id: ??
    api-key: ??
    secret-key: ??
-
 #cas单点登录
 cas:
  prefixUrl: http://cas.example.org:8443/cas
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-sqlserver.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-sqlserver.yml
@ -1,12 +1,7 @@
 server:
  port: 8080
-  undertow:
-    decode-url: true # 启用URL解码
-    # 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
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -248,6 +243,12 @@ jeecg:
      dataSourceSafe: false
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: dev
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
--- 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:
-    decode-url: true # 启用URL解码
-    # 4核CPU标准配置
-    worker-threads: 16
-    buffers:
-      websocket: 8192
-      io: 16384
+  tomcat:
+    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
@ -261,6 +256,12 @@ jeecg:
      dataSourceSafe: true
      # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
      lowCodeMode: prod
+    # 高德地图Api配置(v2.1.3+ BI新增高德地图)
+    gao-de-api:
+      # 应用key
+      api-key: ??
+      # 应用秘钥
+      secret-key: ??
  #xxl-job配置
  xxljob:
    enabled: false
@ -283,7 +284,6 @@ jeecg:
    app-id: ??
    api-key: ??
    secret-key: ??
-
 #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.8.2
+Jeecg  Boot Version: 3.8.3
 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/V3.8.3_0__all_upgrade.sql
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.3_0__all_upgrade.sql
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties
@ -1,9 +1,10 @@
-#code_generate_project_path
-project_path=E:\\workspace\\jeecg-boot
-#bussi_package[User defined]
+# Module path to generate in the backend Java project
+project_path=F:\\gitcode\\JeecgBoot\\jeecg-boot\\jeecg-boot-module\\jeecg-module-demo
+## Path to generate in the frontend VUE3 project
+#ui_project_path=F:\\gitcode\\1jeecg-boot-github\\jeecgboot-vue3
+# Business package path
 bussi_package=org.jeecg.modules.demo

-
 #default code path
 #source_root_package=src
 #webroot_package=WebRoot
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml
@ -69,9 +69,11 @@
 	<!-- 日志输出级别 -->
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
+		
+		<!-- 开发环境关闭日志生成，项目启动快；生产环境请按需打开注释
 		<appender-ref ref="FILE" />
 		<appender-ref ref="HTML" />
-		<appender-ref ref="FILE_HTML" />
+		<appender-ref ref="FILE_HTML" />-->
 	</root>

 </configuration>
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/openapi/test/SampleOpenApiTest.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/openapi/test/SampleOpenApiTest.java
@ -3,19 +3,21 @@ package org.jeecg.modules.openapi.test;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.*;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.junit.jupiter.api.Test;
-import java.security.MessageDigest;

+import java.security.MessageDigest;


 public class SampleOpenApiTest {
    private final String base_url = "http://localhost:8080/jeecg-boot";
    private final String appKey = "ak-pFjyNHWRsJEFWlu6";
    private final String searchKey = "4hV5dBrZtmGAtPdbA5yseaeKRYNpzGsS";
+    
    @Test
    public void test() throws Exception {
        // 根据部门ID查询用户
--- 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
@ -63,9 +63,6 @@ public class SysUserApiTest {
    @MockBean
    private BaseCommonService baseCommonService;

-    @MockBean
-    private ISysUserAgentService sysUserAgentService;
-
    @MockBean
    private ISysPositionService sysPositionService;