From b65a833f08456c9114c89ddaa0bb631217e7cb09 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 3 Nov 2019 21:22:47 +0800 Subject: [PATCH 1/4] :tada: 2.5.3.RELEASE --- README.md | 4 ++-- blade-core-boot/pom.xml | 2 +- blade-core-boot/src/main/resources/bootstrap.yml | 2 +- blade-core-cloud/pom.xml | 2 +- blade-core-develop/pom.xml | 2 +- blade-core-launch/pom.xml | 2 +- .../org/springblade/core/launch/constant/AppConstant.java | 2 +- blade-core-log/pom.xml | 2 +- blade-core-mybatis/pom.xml | 2 +- blade-core-oss/pom.xml | 2 +- blade-core-secure/pom.xml | 2 +- blade-core-swagger/pom.xml | 2 +- .../org/springblade/core/swagger/SwaggerProperties.java | 2 +- blade-core-test/pom.xml | 2 +- blade-core-tool/pom.xml | 2 +- blade-core-transaction/pom.xml | 2 +- pom.xml | 8 ++++---- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index a765d99..cdc7779 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

Build Status - Coverage Status - Downloads + Coverage Status + Downloads

## SpringBlade微服务开发平台 diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index 1d8a462..0a237f2 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-boot/src/main/resources/bootstrap.yml b/blade-core-boot/src/main/resources/bootstrap.yml index e45b2a3..c58738c 100644 --- a/blade-core-boot/src/main/resources/bootstrap.yml +++ b/blade-core-boot/src/main/resources/bootstrap.yml @@ -100,7 +100,7 @@ mybatis-plus: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 2.5.2 + version: 2.5.3 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 090e7d0..89424b9 100644 --- a/blade-core-cloud/pom.xml +++ b/blade-core-cloud/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml index 353645e..938132c 100644 --- a/blade-core-develop/pom.xml +++ b/blade-core-develop/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml index 0eba1cd..c92b263 100644 --- a/blade-core-launch/pom.xml +++ b/blade-core-launch/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 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 fc85a33..6ee5b45 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.5.2"; + String APPLICATION_VERSION = "2.5.3"; /** * 基础包 diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml index 2be851a..a92cf05 100644 --- a/blade-core-log/pom.xml +++ b/blade-core-log/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml index f182d12..ac6c5b9 100644 --- a/blade-core-mybatis/pom.xml +++ b/blade-core-mybatis/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-oss/pom.xml b/blade-core-oss/pom.xml index 6f7c4db..4390ad4 100644 --- a/blade-core-oss/pom.xml +++ b/blade-core-oss/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml index 19e0628..4f7f489 100644 --- a/blade-core-secure/pom.xml +++ b/blade-core-secure/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml index bd78c99..d8b8fe4 100644 --- a/blade-core-swagger/pom.xml +++ b/blade-core-swagger/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 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 15c13ab..384b2fd 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.5.2"; + private String version = "2.5.3"; /** * 许可证 **/ diff --git a/blade-core-test/pom.xml b/blade-core-test/pom.xml index 8cbb427..b248d21 100644 --- a/blade-core-test/pom.xml +++ b/blade-core-test/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml index 274ec2d..815f31f 100644 --- a/blade-core-tool/pom.xml +++ b/blade-core-tool/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-tool - 2.5.2 + 2.5.3 4.0.0 diff --git a/blade-core-transaction/pom.xml b/blade-core-transaction/pom.xml index e4fbbde..740662e 100644 --- a/blade-core-transaction/pom.xml +++ b/blade-core-transaction/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.2 + 2.5.3 4.0.0 diff --git a/pom.xml b/pom.xml index 198001c..80d1d9e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.5.2 + 2.5.3 pom blade-tool @@ -36,7 +36,7 @@ - 2.5.2 + 2.5.3 1.8 3.8.0 @@ -50,9 +50,9 @@ 2.1.5 1.1.0 2.1.0.RELEASE - 0.8.1 + 0.9.0 - 2.1.8.RELEASE + 2.1.9.RELEASE Greenwich.SR3 Cairo-SR8 From 99e4bd757959bc7f4816a0ffd6710c378106a0c0 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 3 Nov 2019 21:33:44 +0800 Subject: [PATCH 2/4] :tada: 2.5.3.RELEASE --- .../org/springblade/core/launch/constant/AppConstant.java | 4 ++++ 1 file changed, 4 insertions(+) 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 6ee5b45..0cb3768 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 @@ -72,6 +72,10 @@ public interface AppConstant { * 资源模块名称 */ String APPLICATION_RESOURCE_NAME = APPLICATION_NAME_PREFIX + "resource"; + /** + * 链路追踪模块名称 + */ + String APPLICATION_ZIPKIN_NAME = APPLICATION_NAME_PREFIX + "zipkin"; /** * 测试模块名称 */ From 3ac1240a5961e18c5793b5d7c0a8ca4df6ffe4ce Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 7 Nov 2019 15:35:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:bug:=20=E6=9D=A1=E4=BB=B6=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E5=8E=BB=E9=99=A4=E5=88=86=E9=A1=B5=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/core/mp/support/Condition.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java b/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java index 929fd5c..ce27a3f 100644 --- a/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java +++ b/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java @@ -65,6 +65,8 @@ public class Condition { public static QueryWrapper getQueryWrapper(Map query, Class clazz) { query.remove("current"); query.remove("size"); + query.remove("ascs"); + query.remove("descs"); QueryWrapper qw = new QueryWrapper<>(); qw.setEntity(BeanUtil.newInstance(clazz)); SqlKeyword.buildCondition(query, qw); From e7343fba988d23930fdb646c40b0e380248036ea Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 17 Nov 2019 20:47:22 +0800 Subject: [PATCH 4/4] :tada: 2.5.4.RELEASE --- blade-core-boot/pom.xml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- blade-core-cloud/pom.xml | 2 +- blade-core-develop/pom.xml | 2 +- blade-core-launch/pom.xml | 2 +- .../core/launch/constant/AppConstant.java | 2 +- .../core/launch/constant/NacosConstant.java | 39 +++++++++++++++++ .../core/launch/utils/PropsUtil.java | 42 +++++++++++++++++++ blade-core-log/pom.xml | 2 +- blade-core-mybatis/pom.xml | 2 +- blade-core-oss/pom.xml | 2 +- blade-core-secure/pom.xml | 2 +- blade-core-swagger/pom.xml | 2 +- .../core/swagger/SwaggerProperties.java | 2 +- blade-core-test/pom.xml | 2 +- blade-core-tool/pom.xml | 2 +- blade-core-transaction/pom.xml | 2 +- pom.xml | 4 +- 18 files changed, 98 insertions(+), 17 deletions(-) create mode 100644 blade-core-launch/src/main/java/org/springblade/core/launch/utils/PropsUtil.java diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index 0a237f2..c15a6cf 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-boot/src/main/resources/bootstrap.yml b/blade-core-boot/src/main/resources/bootstrap.yml index c58738c..071731a 100644 --- a/blade-core-boot/src/main/resources/bootstrap.yml +++ b/blade-core-boot/src/main/resources/bootstrap.yml @@ -100,7 +100,7 @@ mybatis-plus: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 2.5.3 + version: 2.5.4 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 89424b9..fc31522 100644 --- a/blade-core-cloud/pom.xml +++ b/blade-core-cloud/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml index 938132c..b35e73a 100644 --- a/blade-core-develop/pom.xml +++ b/blade-core-develop/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml index c92b263..c4c81e9 100644 --- a/blade-core-launch/pom.xml +++ b/blade-core-launch/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 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 0cb3768..c7e124e 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.5.3"; + String APPLICATION_VERSION = "2.5.4"; /** * 基础包 diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java index f7bcbff..2b83f45 100644 --- a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java +++ b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java @@ -41,4 +41,43 @@ public interface NacosConstant { * nacos 配置文件类型 */ String NACOS_CONFIG_FORMAT = "yaml"; + + /** + * nacos json配置文件类型 + */ + String NACOS_CONFIG_JSON_FORMAT = "json"; + + /** + * nacos 是否刷新 + */ + String NACOS_CONFIG_REFRESH = "true"; + + /** + * nacos 分组 + */ + String NACOS_CONFIG_GROUP = "DEFAULT_GROUP"; + + /** + * 构建服务对应的 dataId + * + * @param appName 服务名 + * @param profile 环境变量 + * @return dataId + */ + static String dataId(String appName, String profile) { + return dataId(appName, profile, NACOS_CONFIG_FORMAT); + } + + /** + * 构建服务对应的 dataId + * + * @param appName 服务名 + * @param profile 环境变量 + * @param format 文件类型 + * @return dataId + */ + static String dataId(String appName, String profile, String format) { + return appName + "-" + profile + "." + format; + } + } diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/utils/PropsUtil.java b/blade-core-launch/src/main/java/org/springblade/core/launch/utils/PropsUtil.java new file mode 100644 index 0000000..434a5f7 --- /dev/null +++ b/blade-core-launch/src/main/java/org/springblade/core/launch/utils/PropsUtil.java @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.gnu.org/licenses/lgpl.html + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springblade.core.launch.utils; + +import org.springframework.util.StringUtils; + +import java.util.Properties; + +/** + * 配置工具类 + * + * @author Chill + */ +public class PropsUtil { + + /** + * 设置配置值，已存在则跳过 + * + * @param props property + * @param key key + * @param value value + */ + public static void setProperty(Properties props, String key, String value) { + if (StringUtils.isEmpty(props.getProperty(key))) { + props.setProperty(key, value); + } + } + +} diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml index a92cf05..439c964 100644 --- a/blade-core-log/pom.xml +++ b/blade-core-log/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml index ac6c5b9..a72b0c9 100644 --- a/blade-core-mybatis/pom.xml +++ b/blade-core-mybatis/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-oss/pom.xml b/blade-core-oss/pom.xml index 4390ad4..2aa1868 100644 --- a/blade-core-oss/pom.xml +++ b/blade-core-oss/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml index 4f7f489..7299c12 100644 --- a/blade-core-secure/pom.xml +++ b/blade-core-secure/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml index d8b8fe4..13bf861 100644 --- a/blade-core-swagger/pom.xml +++ b/blade-core-swagger/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 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 384b2fd..09822f1 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.5.3"; + private String version = "2.5.4"; /** * 许可证 **/ diff --git a/blade-core-test/pom.xml b/blade-core-test/pom.xml index b248d21..2b9c195 100644 --- a/blade-core-test/pom.xml +++ b/blade-core-test/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml index 815f31f..2f8bb48 100644 --- a/blade-core-tool/pom.xml +++ b/blade-core-tool/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-tool - 2.5.3 + 2.5.4 4.0.0 diff --git a/blade-core-transaction/pom.xml b/blade-core-transaction/pom.xml index 740662e..a3da188 100644 --- a/blade-core-transaction/pom.xml +++ b/blade-core-transaction/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 2.5.3 + 2.5.4 4.0.0 diff --git a/pom.xml b/pom.xml index 80d1d9e..5256045 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 2.5.3 + 2.5.4 pom blade-tool @@ -36,7 +36,7 @@ - 2.5.3 + 2.5.4 1.8 3.8.0