diff --git a/README.md b/README.md
index 501384e..e20246b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-
+
## SpringBlade微服务开发平台
@@ -58,7 +58,7 @@ blade-tool
* Sword-基于React:[https://sword.bladex.vip](https://sword.bladex.vip)
## 数据大屏
-* Caster-数据大屏展示系统:[https://caster.bladex.vip](https://caster.bladex.vip)
+* 数据大屏展示系统:[https://data.bladex.vip](https://data.bladex.vip)
## 技术文档
* [SpringBlade开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册)
@@ -71,7 +71,8 @@ blade-tool
* 后端Github地址:[https://github.com/chillzhuang/SpringBlade](https://github.com/chillzhuang/SpringBlade)
* 后端SpringBoot版:[https://gitee.com/smallc/SpringBlade/tree/boot/](https://gitee.com/smallc/SpringBlade/tree/boot/)
* 前端框架Sword(基于React):[https://gitee.com/smallc/Sword](https://gitee.com/smallc/Sword)
-* 前端框架Saber(基于Vue):[https://gitee.com/smallc/Saber](https://gitee.com/smallc/Saber)
+* 前端框架Saber(基于Vue2):[https://gitee.com/smallc/Saber](https://gitee.com/smallc/Saber)
+* 前端框架Saber3(基于Vue3):[https://gitee.com/smallc/Saber3](https://gitee.com/smallc/Saber/tree/3.x/)
## 开源协议
LGPL([GNU Lesser General Public License](http://www.gnu.org/licenses/lgpl.html))
diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml
index d4a5f37..cbc6efb 100644
--- a/blade-core-boot/pom.xml
+++ b/blade-core-boot/pom.xml
@@ -5,7 +5,7 @@
org.springblade
blade-tool
- 3.5.0
+ 3.6.0
4.0.0
@@ -88,13 +88,13 @@
com.alibaba
druid-spring-boot-starter
- 1.2.11
+ 1.2.16
mysql
mysql-connector-java
- 8.0.22
+ 8.0.32
com.github.xiaoymin
- knife4j-micro-spring-boot-starter
- ${knife4j.version}
+ knife4j-openapi2-spring-boot-starter
com.google.guava
diff --git a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java
index 25042fc..b481158 100644
--- a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java
+++ b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java
@@ -55,7 +55,7 @@ public class SwaggerProperties {
/**
* 版本
**/
- private String version = "3.5.0";
+ private String version = "3.6.0";
/**
* 许可证
**/
diff --git a/blade-core-test/pom.xml b/blade-core-test/pom.xml
index 792ca47..97fb053 100644
--- a/blade-core-test/pom.xml
+++ b/blade-core-test/pom.xml
@@ -5,7 +5,7 @@
org.springblade
blade-tool
- 3.5.0
+ 3.6.0
4.0.0
diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml
index f6c4960..de4489a 100644
--- a/blade-core-tool/pom.xml
+++ b/blade-core-tool/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-tool
- 3.5.0
+ 3.6.0
4.0.0
@@ -43,18 +43,10 @@
io.springfox
springfox-swagger2
- ${swagger.version}
-
-
- io.swagger
- swagger-models
-
-
io.swagger
swagger-models
- ${swagger.models.version}
diff --git a/blade-core-tool/src/main/java/org/springblade/core/tool/config/JacksonConfiguration.java b/blade-core-tool/src/main/java/org/springblade/core/tool/config/JacksonConfiguration.java
index e439b79..1692441 100644
--- a/blade-core-tool/src/main/java/org/springblade/core/tool/config/JacksonConfiguration.java
+++ b/blade-core-tool/src/main/java/org/springblade/core/tool/config/JacksonConfiguration.java
@@ -27,10 +27,10 @@ import org.springblade.core.tool.utils.DateUtil;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import java.text.SimpleDateFormat;
@@ -50,8 +50,8 @@ import java.util.TimeZone;
@EnableConfigurationProperties(BladeJacksonProperties.class)
public class JacksonConfiguration {
- @Primary
@Bean
+ @ConditionalOnMissingBean
public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) {
builder.simpleDateFormat(DateUtil.PATTERN_DATETIME);
//创建ObjectMapper
diff --git a/blade-core-transaction/pom.xml b/blade-core-transaction/pom.xml
index 353deab..155e5ef 100644
--- a/blade-core-transaction/pom.xml
+++ b/blade-core-transaction/pom.xml
@@ -5,7 +5,7 @@
blade-tool
org.springblade
- 3.5.0
+ 3.6.0
4.0.0
@@ -40,7 +40,6 @@
io.seata
seata-spring-boot-starter
- ${alibaba.seata.version}
diff --git a/pom.xml b/pom.xml
index 8634417..889aeaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springblade
blade-tool
- 3.5.0
+ 3.6.0
pom
blade-tool
@@ -36,28 +36,26 @@
- 3.5.0
+ 3.6.0
1.8
3.8.1
- 2.10.5
- 1.6.2
- 2.0.9
- 3.5.2
- 3.5.3
+
+ 4.1.0
+ 3.5.3.1
+ 3.5.3.1
1.6.0
3.4.2
- 20.0
- 2.7.1
- 1.2.5
- 2021.0.1.0
- 2.1.0
- 1.5.2
- 2.0.0.RELEASE
+ 31.1-jre
+ 2.3.2
- 2.7.1
- 2021.0.3
- Cairo-SR8
+ 2021.0.5.0
+ 2.1.2
+
+ 5.3.27
+ 2.7.10
+ 2.7.10
+ 2021.0.6
UTF-8
UTF-8
@@ -86,14 +84,11 @@
- org.springframework.plugin
- spring-plugin-core
- ${spring.plugin.version}
-
-
- org.springframework.plugin
- spring-plugin-metadata
- ${spring.plugin.version}
+ org.springframework
+ spring-framework-bom
+ ${spring.version}
+ pom
+ import
org.springframework.boot
@@ -110,9 +105,16 @@
import
- io.spring.platform
- platform-bom
- ${spring.platform.version}
+ com.alibaba.cloud
+ spring-cloud-alibaba-dependencies
+ ${alibaba.cloud.version}
+ pom
+ import
+
+
+ com.github.xiaoymin
+ knife4j-dependencies
+ ${knife4j.version}
pom
import