From c6eb6c75785f00b331eb0bbcaeb66456bea8b1aa Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Thu, 3 Jan 2019 14:02:43 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/launch/constant/AppConstant.java     | 30 -------
 .../core/launch/consul/ConsulConstant.java    | 79 +++++++++++++++++++
 .../consul/ConsulLauncherServiceImpl.java     | 16 ++--
 3 files changed, 89 insertions(+), 36 deletions(-)
 create mode 100644 blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulConstant.java

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 161c6ef..f21dd6b 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
@@ -27,36 +27,6 @@ public interface AppConstant {
 	 */
 	String APPLICATION_VERSION = "2.0.0";
 
-	/**
-	 * consul dev 地址
-	 */
-	String CONSUL_DEV_HOST = "http://localhost";
-
-	/**
-	 * consul prod 地址
-	 */
-	String CONSUL_PROD_HOST = "http://192.168.186.129";
-
-	/**
-	 * consul端口
-	 */
-	String CONSUL_PORT = "8500";
-
-	/**
-	 * consul端口
-	 */
-	String CONSUL_CONFIG_FORMAT = "yaml";
-
-	/**
-	 * consul端口
-	 */
-	String CONSUL_WATCH_DELAY = "1000";
-
-	/**
-	 * consul端口
-	 */
-	String CONSUL_WATCH_ENABLED = "true";
-
 	/**
 	 * 基础包
 	 */
diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulConstant.java b/blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulConstant.java
new file mode 100644
index 0000000..326f4a4
--- /dev/null
+++ b/blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulConstant.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * 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
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * 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.consul;
+
+/**
+ * Consul常量.
+ *
+ * @author Chill
+ */
+public interface ConsulConstant {
+
+	/**
+	 * host key
+	 */
+	String CONSUL_HOST_KEY = "spring.cloud.consul.host";
+
+	/**
+	 * port key
+	 */
+	String CONSUL_PORT_KEY = "spring.cloud.consul.host";
+
+	/**
+	 * format key
+	 */
+	String CONSUL_CONFIG_FORMAT_KEY = "spring.cloud.consul.config.format";
+
+	/**
+	 * delay key
+	 */
+	String CONSUL_WATCH_DELAY_KEY = "spring.cloud.consul.watch.delay";
+
+	/**
+	 * enabled key
+	 */
+	String CONSUL_WATCH_ENABLEd_KEY = "spring.cloud.consul.watch.enabled";
+
+	/**
+	 * consul dev 地址
+	 */
+	String CONSUL_DEV_HOST = "http://localhost";
+
+	/**
+	 * consul prod 地址
+	 */
+	String CONSUL_PROD_HOST = "http://192.168.186.129";
+
+	/**
+	 * consul端口
+	 */
+	String CONSUL_PORT = "8500";
+
+	/**
+	 * consul端口
+	 */
+	String CONSUL_CONFIG_FORMAT = "yaml";
+
+	/**
+	 * consul端口
+	 */
+	String CONSUL_WATCH_DELAY = "1000";
+
+	/**
+	 * consul端口
+	 */
+	String CONSUL_WATCH_ENABLED = "true";
+}
diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulLauncherServiceImpl.java b/blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulLauncherServiceImpl.java
index 8661dd6..4a01e6c 100644
--- a/blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulLauncherServiceImpl.java
+++ b/blade-core-launch/src/main/java/org/springblade/core/launch/consul/ConsulLauncherServiceImpl.java
@@ -24,18 +24,22 @@ import java.util.Properties;
 /**
  * consul启动拓展
  *
- * @author smallchil
+ * @author Chill
  */
 public class ConsulLauncherServiceImpl implements LauncherService {
 
 	@Override
 	public void launcher(SpringApplicationBuilder builder, String appName, String profile) {
 		Properties props = System.getProperties();
-		props.setProperty("spring.cloud.consul.host", profile.equals(AppConstant.DEV_CDOE) ? AppConstant.CONSUL_DEV_HOST : AppConstant.CONSUL_PROD_HOST);
-		props.setProperty("spring.cloud.consul.port", AppConstant.CONSUL_PORT);
-		props.setProperty("spring.cloud.consul.config.format", AppConstant.CONSUL_CONFIG_FORMAT);
-		props.setProperty("spring.cloud.consul.watch.delay", AppConstant.CONSUL_WATCH_DELAY);
-		props.setProperty("spring.cloud.consul.watch.enabled", AppConstant.CONSUL_WATCH_ENABLED);
+		if (props.getProperty(ConsulConstant.CONSUL_HOST_KEY) == null) {
+			props.setProperty(ConsulConstant.CONSUL_HOST_KEY, profile.equals(AppConstant.DEV_CDOE) ? ConsulConstant.CONSUL_DEV_HOST : ConsulConstant.CONSUL_PROD_HOST);
+		}
+		if (props.getProperty(ConsulConstant.CONSUL_PORT_KEY) == null) {
+			props.setProperty(ConsulConstant.CONSUL_PORT_KEY, ConsulConstant.CONSUL_PORT);
+		}
+		props.setProperty(ConsulConstant.CONSUL_CONFIG_FORMAT_KEY, ConsulConstant.CONSUL_CONFIG_FORMAT);
+		props.setProperty(ConsulConstant.CONSUL_WATCH_DELAY_KEY, ConsulConstant.CONSUL_WATCH_DELAY);
+		props.setProperty(ConsulConstant.CONSUL_WATCH_ENABLEd_KEY, ConsulConstant.CONSUL_WATCH_ENABLED);
 	}
 
 }