pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-01-03 20:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

【v3.8.3开源版本发布】

Browse Source 
Merge remote-tracking branch 'origin/master' into springboot3

# Conflicts:
#	README.md
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.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/service/ISysDepartService.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
#	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-seata/pom.xml
#	jeecg-boot/pom.xml
This commit is contained in:
JEECG
2025-09-24 12:01:11 +08:00
parent fc44deca83 5d5d9fc53d
commit 053552c123
308 changed files with 12213 additions and 84594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
View File

@ -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

2
jeecg-boot/jeecg-module-system/jeecg-system-start/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-module-system</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.2</version>
<version>3.8.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

11
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
View File

@ -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
@ -184,7 +179,7 @@ mybatis-plus:
table-underline: true
configuration:
# # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jeecg专用配置

11
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml
View File

@ -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

11
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
View File

@ -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
@ -334,4 +329,4 @@ justauth:
cache:
type: default
prefix: 'demo::'
timeout: 1h
timeout: 1h

9
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-kingbase8.yml
View File

@ -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

9
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-oracle.yml
View File

@ -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

9
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-postgresql.yml
View File

@ -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

9
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
View File

@ -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
@ -288,7 +284,6 @@ jeecg:
app-id: ??
api-key: ??
secret-key: ??
#cas单点登录
cas:
prefixUrl: http://cas.example.org:8443/cas

9
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-sqlserver.yml
View File

@ -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

10
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
View File

@ -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
@ -291,7 +286,6 @@ jeecg:
app-id: ??
api-key: ??
secret-key: ??
#Mybatis输出sql日志
logging:
level:

2
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt
View File

@ -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
版权所属： 北京国炬信息技术有限公司

309
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.3_0__all_upgrade.sql Normal file
View File

File diff suppressed because one or more lines are too long

2
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml
View File

@ -73,7 +73,7 @@
<!-- 开发环境关闭日志生成，项目启动快；生产环境请按需打开注释
<appender-ref ref="FILE" />
<appender-ref ref="HTML" />
<appender-ref ref="FILE_HTML" /> -->
<appender-ref ref="FILE_HTML" />-->
</root>
</configuration>

6
jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/openapi/test/SampleOpenApiTest.java
View File

@ -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查询用户

3
jeecg-boot/jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserApiTest.java
View File

@ -63,9 +63,6 @@ public class SysUserApiTest {
@MockBean
private BaseCommonService baseCommonService;
@MockBean
private ISysUserAgentService sysUserAgentService;
@MockBean
private ISysPositionService sysPositionService;