From a671ef40073a1ef215afdb9b34770e49462246d4 Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 3 Jan 2019 14:25:48 +0800 Subject: [PATCH] :tada: 1.0.0-RC3. --- .../core/launch/BladeApplication.java | 10 ++++---- .../core/launch/consul/ConsulConstant.java | 25 ------------------- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java b/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java index 4369c25..c02e308 100644 --- a/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java +++ b/blade-core-launch/src/main/java/org/springblade/core/launch/BladeApplication.java @@ -92,11 +92,11 @@ public class BladeApplication { props.setProperty("blade.is-local", String.valueOf(isLocalDev())); props.setProperty("blade.dev-mode", profile.equals(AppConstant.PROD_CODE) ? "false" : "true"); props.setProperty("blade.service.version", AppConstant.APPLICATION_VERSION); - props.setProperty(ConsulConstant.CONSUL_HOST_KEY, ConsulConstant.CONSUL_HOST); - 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); + props.setProperty("spring.cloud.consul.host", ConsulConstant.CONSUL_HOST); + props.setProperty("spring.cloud.consul.port", ConsulConstant.CONSUL_PORT); + props.setProperty("spring.cloud.consul.config.format", ConsulConstant.CONSUL_CONFIG_FORMAT); + props.setProperty("spring.cloud.consul.watch.delay", ConsulConstant.CONSUL_WATCH_DELAY); + props.setProperty("spring.cloud.consul.watch.enabled", ConsulConstant.CONSUL_WATCH_ENABLED); // 加载自定义组件 ServiceLoader loader = ServiceLoader.load(LauncherService.class); loader.forEach(launcherService -> launcherService.launcher(builder, appName, profile)); 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 index 79a99aa..436443d 100644 --- 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 @@ -22,31 +22,6 @@ package org.springblade.core.launch.consul; */ public interface ConsulConstant { - /** - * host key - */ - String CONSUL_HOST_KEY = "spring.cloud.consul.host"; - - /** - * port key - */ - String CONSUL_PORT_KEY = "spring.cloud.consul.port"; - - /** - * 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 地址 */