diff --git a/pom.xml b/pom.xml index 2dc1fdca..552e4db6 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-build - 2.1.2.RELEASE + 2.1.3.RELEASE @@ -70,11 +70,11 @@ - 2.1.0.RELEASE - 2.1.0.RELEASE - 2.1.0.RELEASE - 2.1.0.RELEASE - 2.1.0.RELEASE + 2.1.1.RELEASE + 2.1.1.RELEASE + 2.1.1.RELEASE + 2.1.1.RELEASE + 2.1.1.RELEASE 4.12 3.0 diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 5381acdf..889a1510 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.2.RELEASE + 2.1.3.RELEASE diff --git a/spring-cloud-alibaba-dubbo/pom.xml b/spring-cloud-alibaba-dubbo/pom.xml index 21ef87da..2813fbd6 100644 --- a/spring-cloud-alibaba-dubbo/pom.xml +++ b/spring-cloud-alibaba-dubbo/pom.xml @@ -15,8 +15,8 @@ 2.7.1 - 2.1.0.RELEASE - 2.1.0.RELEASE + 2.1.1.RELEASE + 2.1.1.RELEASE 4.0.1 diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml index 5d4becd5..52116dec 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml @@ -29,4 +29,12 @@ spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-maven-plugin + + + \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml index 63d0ced2..d9e4d62b 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml @@ -25,4 +25,12 @@ spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-maven-plugin + + + \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java index c59ac9c9..4ae6ed98 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java @@ -1,6 +1,10 @@ package org.springframework.cloud.alibaba.cloud.examples; -import com.alibaba.nacos.api.config.listener.Listener; +import java.io.IOException; +import java.io.StringReader; +import java.util.Properties; +import java.util.concurrent.Executor; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; @@ -13,9 +17,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Executor; +import com.alibaba.nacos.api.config.listener.Listener; /** * @author xiaojing, Jianwei Mao @@ -37,45 +39,44 @@ class SampleRunner implements ApplicationRunner { @Value("${user.age:25}") int userAge; - - @Autowired - private NacosConfigProperties nacosConfigProperties; + @Autowired + private NacosConfigProperties nacosConfigProperties; @Override public void run(ApplicationArguments args) throws Exception { - System.out.println(String.format("Initial username=%s, userAge=%d", userName, userAge)); + System.out.println( + String.format("Initial username=%s, userAge=%d", userName, userAge)); - nacosConfigProperties.configServiceInstance() - .addListener("nacos-config-example.properties", "DEFAULT_GROUP", new Listener() { + nacosConfigProperties.configServiceInstance().addListener( + "nacos-config-example.properties", "DEFAULT_GROUP", new Listener() { - /** - * Callback with latest config data. - * - * For example, config data in Nacos is: - * - * user.name=Nacos - * user.age=25 - * - * @param configInfo latest config data for specific dataId in Nacos server - */ - @Override - public void receiveConfigInfo(String configInfo) { - String [] configLines = configInfo.split("\r\n"); - Map configs = new HashMap<>(); - for (String c : configLines) { - String [] configPair = c.split("="); - configs.put(configPair[0], configPair[1]); - } + /** + * Callback with latest config data. + * + * For example, config data in Nacos is: + * + * user.name=Nacos user.age=25 + * + * @param configInfo latest config data for specific dataId in Nacos + * server + */ + @Override + public void receiveConfigInfo(String configInfo) { + Properties properties = new Properties(); + try { + properties.load(new StringReader(configInfo)); + } + catch (IOException e) { + e.printStackTrace(); + } + System.out.println("config changed: " + properties); + } - System.out.println(String.format("Latest username=%s, userAge=%s", - configs.get("user.name"), configs.get("user.age"))); - } - - @Override - public Executor getExecutor() { - return null; - } - }); + @Override + public Executor getExecutor() { + return null; + } + }); } } @@ -86,6 +87,7 @@ class SampleController { @Value("${user.name}") String userName; + @Value("${user.age:25}") int age; diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml index 503a96a7..d520efff 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml @@ -25,8 +25,8 @@ 2.7.0 - 2.1.0.RELEASE - 2.1.0.RELEASE + 2.1.1.RELEASE + 2.1.1.RELEASE 4.0.1 diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java index f4d4ae48..0dadefc4 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java @@ -68,7 +68,7 @@ public class NacosDiscoveryProperties { /** * watch delay,duration to pull new service from nacos server. */ - private long watchDelay = 5000; + private long watchDelay = 30000; /** * nacos naming log file name