manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.5.0 升级到 spring boot 2.6.8

Browse Source
This commit is contained in:
thinkgem
2022-05-24 11:59:19 +08:00
parent 03592947d4
commit 071aa747c8
12 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -5,7 +5,7 @@
<h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot</h3>
<p align="center">
<a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-V4.4" src="https://img.shields.io/badge/JeeSite-V4.4-success.svg"></a>
<a href="https://spring.io/projects/spring-boot#learn" target="__blank"><img alt="SpringBoot-2.5" src="https://img.shields.io/badge/SpringBoot-2.5-blue.svg"></a>
<a href="https://spring.io/projects/spring-boot#learn" target="__blank"><img alt="SpringBoot-2.6" src="https://img.shields.io/badge/SpringBoot-2.6-blue.svg"></a>
<a href="https://gitee.com/thinkgem/jeesite4/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite4/badge/star.svg?theme=dark"></a>
<a href="https://gitee.com/thinkgem/jeesite4/members" target="__blank"><img alt="fork" src="https://gitee.com/thinkgem/jeesite4/badge/fork.svg?theme=dark"></a>
</p>
@@ -51,7 +51,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
## 技术选型
* 主框架：Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.9、J2Cache
* 主框架：Spring Boot 2.6、Spring Framework 5.3、Apache Shiro 1.9、J2Cache
* 持久层：Apache MyBatis 3.5、Hibernate Validator 6.2、Alibaba Druid 1.2
* 视图层：Spring MVC 5.3、Beetl 3.3（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
* 前端组件：jQuery 3.5、jqGrid 4.7、layer 3.5、zTree 3.5、jQuery Validation

2
common/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

20
common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
View File

@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.introspect.Annotated;
import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import com.fasterxml.jackson.databind.util.JSONPObject;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
//import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.io.PropertiesUtils;
import com.jeesite.common.lang.DateUtils;
@@ -222,15 +222,15 @@ public class JsonMapper extends ObjectMapper {
return this;
}
/**
* 支持使用Jaxb的Annotation，使得POJO上的annotation不用与Jackson耦合。
* 默认会先查找jaxb的annotation，如果找不到再找jackson的。
*/
public JsonMapper enableJaxbAnnotation() {
JaxbAnnotationModule module = new JaxbAnnotationModule();
this.registerModule(module);
return this;
}
// /**
// * 支持使用Jaxb的Annotation，使得POJO上的annotation不用与Jackson耦合。
// * 默认会先查找jaxb的annotation，如果找不到再找jackson的。
// */
// public JsonMapper enableJaxbAnnotation() {
// JaxbAnnotationModule module = new JaxbAnnotationModule();
// this.registerModule(module);
// return this;
// }
/**
* 取出Mapper做进一步的设置或使用其他序列化API.

2
modules/cms/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

2
modules/core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

4
modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml
View File

@@ -69,10 +69,10 @@ spring:
config:
server-addr: 127.0.0.1:8848
file-extension: yml
group: jeesite-cloud-43
group: jeesite-cloud-yml
ext-config:
- data-id: application.yml
group: jeesite-cloud-43
group: jeesite-cloud-yml
# 打印横幅
main:

2
modules/core/src/test/java/application.yml
View File

@@ -4,7 +4,7 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.4
productVersion: V4.5
copyrightYear: 2022
# 数据库连接

6
parent/pom.xml
View File

@@ -6,12 +6,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.13</version>
<version>2.6.8</version>
</parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JeeSite Parent</name>
@@ -25,7 +25,7 @@
<commons-text.version>1.9</commons-text.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<fst.version>2.57</fst.version>
<fastjson.version>1.2.80</fastjson.version>
<fastjson.version>1.2.83</fastjson.version>
<commons-email.version>1.5</commons-email.version>
<!-- <jackson.version>2.12.6</jackson.version> -->
<!-- <activation.version>1.1.1</activation.version> -->

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.jeesite</groupId>
<artifactId>jeesite</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JeeSite</name>

2
root/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.jeesite</groupId>
<artifactId>jeesite-root</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JeeSite Root</name>

2
web/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

8
web/src/main/resources/config/application.yml
View File

@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.4
productVersion: V4.5
copyrightYear: 2022
# 是否演示模式
@@ -24,6 +24,7 @@ server:
servlet:
context-path: /js
register-default-servlet: false
encoding.enabled: true
tomcat:
uri-encoding: UTF-8
# 表单请求数据的最大大小
@@ -251,6 +252,11 @@ spring:
# 打印横幅
main:
bannerMode: "off"
# MVC 映射匹配策略
mvc:
pathmatch:
matching-strategy: ANT_PATH_MATCHER
# # Redis 连接参数 （RedisProperties）
# redis: