diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index 4763def..f6481a0 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-boot/src/main/resources/bootstrap.yml b/blade-core-boot/src/main/resources/bootstrap.yml index ee6b439..37ce43d 100644 --- a/blade-core-boot/src/main/resources/bootstrap.yml +++ b/blade-core-boot/src/main/resources/bootstrap.yml @@ -75,7 +75,7 @@ mybatis-plus: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 2.3.3 + version: 2.4.0 license: Powered By SpringBlade licenseUrl: https://bladex.vip terms-of-service-url: https://bladex.vip diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml index 106bfcc..a16cad2 100644 --- a/blade-core-cloud/pom.xml +++ b/blade-core-cloud/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 @@ -55,18 +55,20 @@ + - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery ${alibaba.cloud.version} - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config ${alibaba.cloud.version} + - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel ${alibaba.cloud.version} diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml index 7057045..561615f 100644 --- a/blade-core-develop/pom.xml +++ b/blade-core-develop/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm index f3a9eae..df1482e 100644 --- a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm +++ b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm @@ -6,6 +6,7 @@ :permission="permissionList" :before-open="beforeOpen" v-model="form" + ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml index feafc55..fcda8c6 100644 --- a/blade-core-launch/pom.xml +++ b/blade-core-launch/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java index 1580874..098c3bb 100644 --- a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java +++ b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java @@ -25,7 +25,7 @@ public interface AppConstant { /** * 应用版本 */ - String APPLICATION_VERSION = "2.3.3"; + String APPLICATION_VERSION = "2.4.0"; /** * 基础包 diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml index 4ec0865..dc09602 100644 --- a/blade-core-log/pom.xml +++ b/blade-core-log/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml index ec05d42..9208291 100644 --- a/blade-core-mybatis/pom.xml +++ b/blade-core-mybatis/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/SqlKeyword.java b/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/SqlKeyword.java index a8bf09b..bd4b269 100644 --- a/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/SqlKeyword.java +++ b/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/SqlKeyword.java @@ -28,7 +28,7 @@ import java.util.Map; * @author Chill */ public class SqlKeyword { - private final static String SQL_REGEX = "'|%|--|insert|delete|update|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql"; + private final static String SQL_REGEX = "'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql"; private static final String EQUAL = "_equal"; private static final String NOT_EQUAL = "_notequal"; diff --git a/blade-core-oss/pom.xml b/blade-core-oss/pom.xml index 40dd0de..8ba0bf6 100644 --- a/blade-core-oss/pom.xml +++ b/blade-core-oss/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml index 2e128d8..7da0d59 100644 --- a/blade-core-secure/pom.xml +++ b/blade-core-secure/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml index e9d6349..2475e46 100644 --- a/blade-core-swagger/pom.xml +++ b/blade-core-swagger/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.3.3 + 2.4.0 4.0.0 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 0283de3..39877b5 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 = "2.3.3"; + private String version = "2.4.0"; /** * 许可证 **/ diff --git a/blade-core-test/pom.xml b/blade-core-test/pom.xml index 51355ad..f992337 100644 --- a/blade-core-test/pom.xml +++ b/blade-core-test/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml index 181bdff..61b2526 100644 --- a/blade-core-tool/pom.xml +++ b/blade-core-tool/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-tool - 2.3.3 + 2.4.0 4.0.0 diff --git a/pom.xml b/pom.xml index 9297d9e..40c9ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.3.3 + 2.4.0 pom blade-tool @@ -36,20 +36,20 @@ - 2.3.3 + 2.4.0 1.8 3.8.0 2.9.2 1.5.21 - 1.9.4 + 1.9.5 3.1.2 4.0.1 1.6.0 3.4.2 2.1.5 1.1.0 - 0.9.0.RELEASE + 2.1.0.RELEASE 2.1.6.RELEASE Greenwich.SR2