From b4b8fa0d1957035eefad9754893484572184fcd0 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Mon, 19 Nov 2018 16:18:33 +0800 Subject: [PATCH] Polish Config Server --- pom.xml | 11 +++++++++-- spring-cloud-alibaba-nacos-config-server/pom.xml | 1 + .../server/NacosConfigServerAutoConfiguration.java | 2 ++ .../server/bootstrap/NacosConfigServerBootstrap.java | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 38ac083ca..1969d6283 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,13 @@ hengyunabc hengyunabc@gmail.com + + mercyblitz + Mercy Ma + mercyblitz@gmail.com + Alibaba + https://github.com/mercyblitz + @@ -81,14 +88,14 @@ spring-cloud-alibaba-sentinel-datasource spring-cloud-alibaba-nacos-config spring-cloud-alibaba-nacos-discovery + spring-cloud-alibaba-nacos-config-server + spring-cloud-alicloud-context spring-cloud-alibaba-examples spring-cloud-alibaba-test spring-cloud-alibaba-docs spring-cloud-starter-alibaba spring-cloud-starter-alicloud spring-cloud-alicloud-oss - spring-cloud-alibaba-nacos-config-server - spring-cloud-alicloud-context spring-cloud-alicloud-acm spring-cloud-alicloud-ans diff --git a/spring-cloud-alibaba-nacos-config-server/pom.xml b/spring-cloud-alibaba-nacos-config-server/pom.xml index 036e7025d..9287892e8 100644 --- a/spring-cloud-alibaba-nacos-config-server/pom.xml +++ b/spring-cloud-alibaba-nacos-config-server/pom.xml @@ -12,6 +12,7 @@ org.springframework.cloud spring-cloud-alibaba-nacos-config-server + Spring Cloud Alibaba Nacos Config Server diff --git a/spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java b/spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java index 42461f239..74a4903dc 100644 --- a/spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java @@ -23,6 +23,7 @@ import org.springframework.cloud.config.server.EnableConfigServer; import org.springframework.cloud.config.server.config.ConfigServerAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; /** * Nacos Config Server Auto-Configuration @@ -35,6 +36,7 @@ import org.springframework.context.annotation.ComponentScan; "com.alibaba.nacos.config.server", }) @AutoConfigureBefore(ConfigServerAutoConfiguration.class) +@Configuration public class NacosConfigServerAutoConfiguration { @Bean diff --git a/spring-cloud-alibaba-nacos-config-server/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java b/spring-cloud-alibaba-nacos-config-server/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java index 68d92e7db..3e379457e 100644 --- a/spring-cloud-alibaba-nacos-config-server/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java +++ b/spring-cloud-alibaba-nacos-config-server/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java @@ -16,9 +16,11 @@ */ package org.springframework.cloud.alibaba.nacos.config.server.bootstrap; +import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.config.server.EnableConfigServer; +import org.springframework.context.annotation.Bean; /** * Nacos Config Server Bootstrap @@ -34,4 +36,12 @@ public class NacosConfigServerBootstrap { System.setProperty("nacos.standalone", "true"); SpringApplication.run(NacosConfigServerBootstrap.class); } + + @Bean + public ApplicationRunner applicationRunner() { + + return args -> { + System.out.println("Running..."); + }; + } }