From 4cfb0b0ceab5a8a643658da86cd9b0847d43df24 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 4 Aug 2019 20:51:34 +0800 Subject: [PATCH] :tada: 2.0.6.RELEASE --- blade-common/pom.xml | 2 +- .../common/launch/LauncherServiceImpl.java | 19 ++++++++++--------- .../blade-dubbo-provider-api/pom.xml | 2 +- blade-example-api/pom.xml | 4 ++-- blade-example/blade-dubbo-consumer/pom.xml | 2 +- blade-example/blade-dubbo-provider/pom.xml | 2 +- blade-example/pom.xml | 4 ++-- blade-gateway/pom.xml | 6 +++--- blade-service-api/blade-demo-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 ++-- blade-service/blade-demo/pom.xml | 2 +- .../launcher/DemoLauncherServiceImpl.java | 7 ++++--- blade-service/pom.xml | 4 ++-- pom.xml | 10 +++++----- script/docker/.env | 2 +- 15 files changed, 37 insertions(+), 35 deletions(-) diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 684d773a4..0885df9ca 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 diff --git a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index e5e553b94..167ea828b 100644 --- a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -20,6 +20,7 @@ import org.springblade.common.constant.CommonConstant; import org.springblade.core.auto.service.AutoService; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.launch.service.LauncherService; +import org.springblade.core.launch.utils.PropsUtil; import org.springframework.boot.builder.SpringApplicationBuilder; import java.util.Properties; @@ -36,16 +37,16 @@ public class LauncherServiceImpl implements LauncherService { public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { Properties props = System.getProperties(); // 通用注册 - props.setProperty("spring.cloud.nacos.discovery.server-addr", CommonConstant.nacosAddr(profile)); - props.setProperty("spring.cloud.nacos.config.server-addr", CommonConstant.nacosAddr(profile)); - props.setProperty("spring.cloud.sentinel.transport.dashboard", CommonConstant.sentinelAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", CommonConstant.nacosAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", CommonConstant.nacosAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", CommonConstant.sentinelAddr(profile)); // dubbo注册 - props.setProperty("dubbo.application.name", appName); - props.setProperty("dubbo.application.qos.enable", "false"); - props.setProperty("dubbo.protocol.name", "dubbo"); - props.setProperty("dubbo.registry.address", "nacos://" + CommonConstant.nacosAddr(profile)); - props.setProperty("dubbo.version", AppConstant.APPLICATION_VERSION); - props.setProperty("dubbo.scan.base-packages", AppConstant.BASE_PACKAGES); + PropsUtil.setProperty(props, "dubbo.application.name", appName); + PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false"); + PropsUtil.setProperty(props, "dubbo.protocol.name", "dubbo"); + PropsUtil.setProperty(props, "dubbo.registry.address", "nacos://" + CommonConstant.nacosAddr(profile)); + PropsUtil.setProperty(props, "dubbo.version", AppConstant.APPLICATION_VERSION); + PropsUtil.setProperty(props, "dubbo.scan.base-packages", AppConstant.BASE_PACKAGES); } } diff --git a/blade-example-api/blade-dubbo-provider-api/pom.xml b/blade-example-api/blade-dubbo-provider-api/pom.xml index 664abe560..661830b29 100644 --- a/blade-example-api/blade-dubbo-provider-api/pom.xml +++ b/blade-example-api/blade-dubbo-provider-api/pom.xml @@ -5,7 +5,7 @@ blade-example-api org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 diff --git a/blade-example-api/pom.xml b/blade-example-api/pom.xml index 35287bd0f..32822d6a0 100644 --- a/blade-example-api/pom.xml +++ b/blade-example-api/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 blade-example-api ${project.artifactId} - 2.0.5.RELEASE + 2.0.6.RELEASE pom BladeX 微服务范例API集合 diff --git a/blade-example/blade-dubbo-consumer/pom.xml b/blade-example/blade-dubbo-consumer/pom.xml index c562282c0..4f274939a 100644 --- a/blade-example/blade-dubbo-consumer/pom.xml +++ b/blade-example/blade-dubbo-consumer/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 diff --git a/blade-example/blade-dubbo-provider/pom.xml b/blade-example/blade-dubbo-provider/pom.xml index d80220504..60f749e35 100644 --- a/blade-example/blade-dubbo-provider/pom.xml +++ b/blade-example/blade-dubbo-provider/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 diff --git a/blade-example/pom.xml b/blade-example/pom.xml index a484038aa..316a79547 100644 --- a/blade-example/pom.xml +++ b/blade-example/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 blade-example ${project.artifactId} - 2.0.5.RELEASE + 2.0.6.RELEASE pom BladeX 微服务范例集合 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 4a17f13d5..d3d1859cb 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 @@ -69,12 +69,12 @@ - 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} diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 8ae16f331..9d9913d37 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 6e640778d..6887f2a5d 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,14 +5,14 @@ BladeX-Biz org.springblade - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.0.5.RELEASE + 2.0.6.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index de6e7d066..45bbbce75 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.0.5.RELEASE + 2.0.6.RELEASE 4.0.0 diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java b/blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java index ca7e88d16..555ab0841 100644 --- a/blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java @@ -19,6 +19,7 @@ package com.example.demo.launcher; import org.springblade.core.auto.service.AutoService; import org.springblade.core.launch.constant.NacosConstant; import org.springblade.core.launch.service.LauncherService; +import org.springblade.core.launch.utils.PropsUtil; import org.springframework.boot.builder.SpringApplicationBuilder; import java.util.Properties; @@ -34,9 +35,9 @@ public class DemoLauncherServiceImpl implements LauncherService { @Override public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { Properties props = System.getProperties(); - props.setProperty("spring.cloud.nacos.config.ext-config[0].data-id", NacosConstant.dataId(appName, profile)); - props.setProperty("spring.cloud.nacos.config.ext-config[0].group", NacosConstant.NACOS_CONFIG_GROUP); - props.setProperty("spring.cloud.nacos.config.ext-config[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].data-id", NacosConstant.dataId(appName, profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].group", NacosConstant.NACOS_CONFIG_GROUP); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); } @Override diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 915506200..3be1c86a3 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade BladeX-Biz - 2.0.5.RELEASE + 2.0.6.RELEASE blade-service ${project.artifactId} - 2.0.5.RELEASE + 2.0.6.RELEASE pom BladeX 微服务集合 diff --git a/pom.xml b/pom.xml index a9ff9155e..e07aedb20 100644 --- a/pom.xml +++ b/pom.xml @@ -5,17 +5,17 @@ org.springblade BladeX-Biz - 2.0.5.RELEASE + 2.0.6.RELEASE pom - 2.0.5.RELEASE - 2.0.5.RELEASE + 2.0.6.RELEASE + 2.0.6.RELEASE 1.8 2.9.2 1.5.21 - 1.9.4 + 1.9.5 3.1.0 4.0.1 1.6.0 @@ -23,7 +23,7 @@ 8.0.16 2.1.4 - 0.9.0.RELEASE + 2.1.0.RELEASE 2.7.1 2.1.6.RELEASE diff --git a/script/docker/.env b/script/docker/.env index 659cceb25..6bd654cf6 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.0.5.RELEASE +TAG=2.0.6.RELEASE