diff --git a/README.md b/README.md index 885416ae..6e352b6d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

快速开发平台 - Spring Boot

JeeSite-V4.4 - SpringBoot-2.5 + SpringBoot-2.6 star fork

@@ -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 diff --git a/common/pom.xml b/common/pom.xml index 4a78f68c..9961ad55 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.4.2-SNAPSHOT + 4.5.0-SNAPSHOT ../parent/pom.xml diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java index 63f72760..19181bba 100644 --- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java +++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java @@ -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. diff --git a/modules/cms/pom.xml b/modules/cms/pom.xml index f089f2c4..d039c544 100644 --- a/modules/cms/pom.xml +++ b/modules/cms/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.4.2-SNAPSHOT + 4.5.0-SNAPSHOT ../../parent/pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4402a44d..d0bf68bb 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.4.2-SNAPSHOT + 4.5.0-SNAPSHOT ../../parent/pom.xml diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml index 9ea8ea32..5ac48fbd 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml @@ -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: diff --git a/modules/core/src/test/java/application.yml b/modules/core/src/test/java/application.yml index 5c633ffc..9ef8f0bf 100644 --- a/modules/core/src/test/java/application.yml +++ b/modules/core/src/test/java/application.yml @@ -4,7 +4,7 @@ productName: JeeSite Demo companyName: ThinkGem # 产品版本、版权年份 -productVersion: V4.4 +productVersion: V4.5 copyrightYear: 2022 # 数据库连接 diff --git a/parent/pom.xml b/parent/pom.xml index 822e11ea..1e369501 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -6,12 +6,12 @@ org.springframework.boot spring-boot-starter-parent - 2.5.13 + 2.6.8 com.jeesite jeesite-parent - 4.4.2-SNAPSHOT + 4.5.0-SNAPSHOT pom JeeSite Parent @@ -25,7 +25,7 @@ 1.9 1.9.4 2.57 - 1.2.80 + 1.2.83 1.5 diff --git a/pom.xml b/pom.xml index 978199ef..40901436 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.jeesite jeesite - 4.4.2-SNAPSHOT + 4.5.0-SNAPSHOT pom JeeSite diff --git a/root/pom.xml b/root/pom.xml index bcfebbba..c22a5ecb 100644 --- a/root/pom.xml +++ b/root/pom.xml @@ -5,7 +5,7 @@ com.jeesite jeesite-root - 4.4.2-SNAPSHOT + 4.5.0-SNAPSHOT pom JeeSite Root diff --git a/web/pom.xml b/web/pom.xml index 1fa4e0ee..5bc62f2a 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.4.2-SNAPSHOT + 4.5.0-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 3cfb2660..df418c78 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -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: