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