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

3.7.0大版本发布

Browse Source
This commit is contained in:
JEECG
2024-06-11 22:58:04 +08:00
parent 857fb53fa1
commit a6b6e7c9d4
205 changed files with 3807 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-start/Dockerfile
View File

@ -11,6 +11,6 @@ WORKDIR /jeecg-boot
EXPOSE 8080
#ADD ./src/main/resources/jeecg ./config/jeecg
ADD ./target/jeecg-system-start-3.6.3.jar ./
ADD ./target/jeecg-system-start-3.7.0.jar ./
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.6.3.jar
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.7.0.jar

24
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.6.3</version>
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -24,26 +24,8 @@
<artifactId>jeecg-module-demo</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
<!--人大金仓
<dependency>
<groupId>org.jeecgframework</groupId>
<artifactId>kingbase8</artifactId>
<version>9.0.0</version>
<scope>runtime</scope>
</dependency>-->
<!--达梦数据库 -->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>Dm8JdbcDriver18</artifactId>
<version>${dm8.version}</version>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmDialect-for-hibernate5.0</artifactId>
<version>${dm8.version}</version>
</dependency>
<!-- flyway支持 mysql5.7、mysql8、MariaDB10.3.16 -->
<!-- flyway 数据库自动升级 -->
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>

1
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
View File

@ -2,7 +2,6 @@ package org.jeecg;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.shiro.ignore.InMemoryIgnoreAuth;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;

8
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/config/flyway/FlywayConfig.java
View File

@ -45,7 +45,7 @@ public class FlywayConfig {
/**
* 迁移sql脚本文件存放路径，官方默认db/migration
*/
@Value("${spring.flyway.locations:}")
@Value("${spring.flyway.locations:classpath:flyway/sql/mysql}")
private String locations;
/**
@ -123,12 +123,12 @@ public class FlywayConfig {
.cleanDisabled(cleanDisabled)
.load();
flyway.migrate();
log.info("【升级提示】平台集成了MySQL库的Flyway，数据库版本自动升级! ");
log.info("【数据库升级】平台集成了MySQL库的Flyway，数据库版本自动升级! ");
} catch (FlywayException e) {
log.error("【升级提示】flyway执行sql脚本失败", e);
log.error("【数据库升级】flyway执行sql脚本失败", e);
}
} else {
log.warn("【升级提示】平台只集成了MySQL库的Flyway，实现了数据库版本自动升级! 其他类型的数据库，您可以考虑手工升级~");
log.warn("【数据库升级】平台只集成了MySQL库的Flyway，实现了数据库版本自动升级! 其他类型的数据库，您可以考虑手工升级~");
}
}
});

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

@ -17,7 +17,7 @@ management:
endpoints:
web:
exposure:
include: metrics,httptrace
include: metrics,httptrace-new
spring:
# flyway配置
@ -152,6 +152,9 @@ spring:
maxPoolPreparedStatementPerConnectionSize: 20
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filters: stat,wall,slf4j
# 允许SELECT语句的WHERE子句是一个永真条件
wall:
selectWhereAlwayTrueCheck: false
# 打开mergeSql功能；慢SQL记录
stat:
merge-sql: true
@ -176,7 +179,7 @@ spring:
password: ''
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
@ -203,7 +206,7 @@ jeecg:
# 签名密钥串(前后端要一致，正式发布请自行修改)
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
#签名拦截接口
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
# 本地：local、Minio：minio、阿里云：alioss
uploadType: local
# 前端访问地址
@ -216,7 +219,7 @@ jeecg:
#webapp文件路径
webapp: /opt/webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/jmreport/bigscreen2/**
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: ??

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

@ -17,7 +17,7 @@ management:
endpoints:
web:
exposure:
include: metrics,httptrace
include: metrics,httptrace-new
spring:
# flyway配置
@ -152,6 +152,9 @@ spring:
maxPoolPreparedStatementPerConnectionSize: 20
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filters: stat,wall,slf4j
# 允许SELECT语句的WHERE子句是一个永真条件
wall:
selectWhereAlwayTrueCheck: false
# 打开mergeSql功能；慢SQL记录
stat:
merge-sql: true
@ -176,7 +179,7 @@ spring:
password: ''
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
@ -203,7 +206,7 @@ jeecg:
# 签名密钥串(前后端要一致，正式发布请自行修改)
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
#签名拦截接口
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
# local\minio\alioss
uploadType: alioss
# 前端访问地址
@ -240,7 +243,7 @@ jeecg:
#大屏报表参数设置
jmreport:
#多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
saasMode: created
saasMode:
# 平台上线安全配置(v1.6.2+ 新增)
firewall:
# 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
@ -277,7 +280,7 @@ knife4j:
#开启增强配置
enable: true
#开启生产环境屏蔽
production: false
production: true
basic:
enable: true
username: jeecg

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

@ -17,7 +17,7 @@ management:
endpoints:
web:
exposure:
include: metrics,httptrace
include: metrics,httptrace-new
spring:
# flyway配置
@ -49,7 +49,7 @@ spring:
max-request-size: 10MB
mail:
host: smtp.163.com
username: ??
username: jeecgos@163.com
password: ??
properties:
mail:
@ -152,6 +152,9 @@ spring:
maxPoolPreparedStatementPerConnectionSize: 20
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filters: stat,wall,slf4j
# 允许SELECT语句的WHERE子句是一个永真条件
wall:
selectWhereAlwayTrueCheck: false
# 打开mergeSql功能；慢SQL记录
stat:
merge-sql: true
@ -171,12 +174,12 @@ spring:
#redis 配置
redis:
database: 0
host: 192.168.1.199
host: 192.168.1.188
port: 6379
password: ''
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
@ -203,7 +206,7 @@ jeecg:
# 签名密钥串(前后端要一致，正式发布请自行修改)
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
#签名拦截接口
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
# local\minio\alioss
uploadType: local
# 前端访问地址
@ -240,7 +243,7 @@ jeecg:
#大屏报表参数设置
jmreport:
#多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
saasMode: created
saasMode:
# 平台上线安全配置(v1.6.2+ 新增)
firewall:
# 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)

2
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.6.3
Jeecg Boot Version: 3.7.0
Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
产品官网： www.jeecg.com
版权所属： 北京国炬信息技术有限公司

286
jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.6.4__all_upgrade.sql Normal file
View File

File diff suppressed because one or more lines are too long

21
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/smallTools/TestStr.java
View File

@ -6,6 +6,7 @@ import org.junit.Test;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Base64;
/**
* 字符串处理测试
@ -52,4 +53,24 @@ public class TestStr {
System.out.println(sql);
}
@Test
public void base64(){
String encodedString = "5L+d5a2Y5aSx6LSl77yM5YWN6LS554mI5pyA5aSa5Yib5bu6ezB95p2h6L+e5o6l77yM6K+35Y2H57qn5ZWG5Lia54mI77yB";
byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
String decodedString = new String(decodedBytes);
String tipMsg = MessageFormat.format(decodedString, 10);
System.out.println(tipMsg);
}
/**
* 正则测试字符串只保存中文和数字和字母
*/
@Test
public void testSpecialChar() {
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);
}
}