From d6ef39293712063fc0c4057fcc807b8cf1e82ab3 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 3 Aug 2019 15:45:30 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=A1=8C=E5=90=AF=E5=8A=A8=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/launch/LauncherServiceImpl.java | 7 ++++--- .../springblade/flow/launch/FlowLauncherServiceImpl.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) 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 59f5e8ef..956c3217 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 @@ -19,6 +19,7 @@ package org.springblade.common.launch; import org.springblade.common.constant.CommonConstant; import org.springblade.core.auto.service.AutoService; 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 LauncherServiceImpl implements LauncherService { @Override 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)); } } diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/launch/FlowLauncherServiceImpl.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/launch/FlowLauncherServiceImpl.java index 189fb084..8cb4fe3c 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/launch/FlowLauncherServiceImpl.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/launch/FlowLauncherServiceImpl.java @@ -19,6 +19,7 @@ package org.springblade.flow.launch; 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 FlowLauncherServiceImpl 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); } }