study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
mercyblitz 2019-04-13 08:36:00 +08:00
commit da86149ffb
8 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId> <artifactId>spring-cloud-build</artifactId>
<version>2.1.2.RELEASE</version> <version>2.1.3.RELEASE</version>
<relativePath/> <relativePath/>
</parent> </parent>
@ -70,11 +70,11 @@
<properties> <properties>
<!-- Dependency Versions --> <!-- Dependency Versions -->
<spring-cloud-commons.version>2.1.0.RELEASE</spring-cloud-commons.version> <spring-cloud-commons.version>2.1.1.RELEASE</spring-cloud-commons.version>
<spring-cloud-netflix.version>2.1.0.RELEASE</spring-cloud-netflix.version> <spring-cloud-netflix.version>2.1.1.RELEASE</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.1.0.RELEASE</spring-cloud-openfeign.version> <spring-cloud-openfeign.version>2.1.1.RELEASE</spring-cloud-openfeign.version>
<spring-cloud-bus.version>2.1.0.RELEASE</spring-cloud-bus.version> <spring-cloud-bus.version>2.1.1.RELEASE</spring-cloud-bus.version>
<spring-cloud-gateway.version>2.1.0.RELEASE</spring-cloud-gateway.version> <spring-cloud-gateway.version>2.1.1.RELEASE</spring-cloud-gateway.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<javax-servlet-api>3.0</javax-servlet-api> <javax-servlet-api>3.0</javax-servlet-api>

2
spring-cloud-alibaba-dependencies/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>spring-cloud-dependencies-parent</artifactId> <artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<version>2.1.2.RELEASE</version> <version>2.1.3.RELEASE</version>
<relativePath/> <relativePath/>
</parent> </parent>

4
spring-cloud-alibaba-dubbo/pom.xml
View File

@ -15,8 +15,8 @@
<properties> <properties>
<dubbo.version>2.7.1</dubbo.version> <dubbo.version>2.7.1</dubbo.version>
<spring-cloud-zookeeper.version>2.1.0.RELEASE</spring-cloud-zookeeper.version> <spring-cloud-zookeeper.version>2.1.1.RELEASE</spring-cloud-zookeeper.version>
<spring-cloud-consul.version>2.1.0.RELEASE</spring-cloud-consul.version> <spring-cloud-consul.version>2.1.1.RELEASE</spring-cloud-consul.version>
<curator.version>4.0.1</curator.version> <curator.version>4.0.1</curator.version>
</properties> </properties>

8
spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml
View File

@ -29,4 +29,12 @@
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

8
spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml
View File

@ -25,4 +25,12 @@
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

76
spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java
View File

@ -1,6 +1,10 @@
package org.springframework.cloud.alibaba.cloud.examples; 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.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap; import com.alibaba.nacos.api.config.listener.Listener;
import java.util.Map;
import java.util.concurrent.Executor;
/** /**
* @author xiaojing, Jianwei Mao * @author xiaojing, Jianwei Mao
@ -37,45 +39,44 @@ class SampleRunner implements ApplicationRunner {
@Value("${user.age:25}") @Value("${user.age:25}")
int userAge; int userAge;
@Autowired
@Autowired private NacosConfigProperties nacosConfigProperties;
private NacosConfigProperties nacosConfigProperties;
@Override @Override
public void run(ApplicationArguments args) throws Exception { 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() nacosConfigProperties.configServiceInstance().addListener(
.addListener("nacos-config-example.properties", "DEFAULT_GROUP", new Listener() { "nacos-config-example.properties", "DEFAULT_GROUP", new Listener() {
/** /**
* Callback with latest config data. * Callback with latest config data.
* *
* For example, config data in Nacos is: * For example, config data in Nacos is:
* *
* user.name=Nacos * user.name=Nacos user.age=25
* user.age=25 *
* * @param configInfo latest config data for specific dataId in Nacos
* @param configInfo latest config data for specific dataId in Nacos server * server
*/ */
@Override @Override
public void receiveConfigInfo(String configInfo) { public void receiveConfigInfo(String configInfo) {
String [] configLines = configInfo.split("\r\n"); Properties properties = new Properties();
Map<String, String> configs = new HashMap<>(); try {
for (String c : configLines) { properties.load(new StringReader(configInfo));
String [] configPair = c.split("="); }
configs.put(configPair[0], configPair[1]); catch (IOException e) {
} e.printStackTrace();
}
System.out.println("config changed: " + properties);
}
System.out.println(String.format("Latest username=%s, userAge=%s", @Override
configs.get("user.name"), configs.get("user.age"))); public Executor getExecutor() {
} return null;
}
@Override });
public Executor getExecutor() {
return null;
}
});
} }
} }
@ -86,6 +87,7 @@ class SampleController {
@Value("${user.name}") @Value("${user.name}")
String userName; String userName;
@Value("${user.age:25}") @Value("${user.age:25}")
int age; int age;

4
spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
View File

@ -25,8 +25,8 @@
<properties> <properties>
<dubbo.version>2.7.0</dubbo.version> <dubbo.version>2.7.0</dubbo.version>
<spring-cloud-zookeeper.version>2.1.0.RELEASE</spring-cloud-zookeeper.version> <spring-cloud-zookeeper.version>2.1.1.RELEASE</spring-cloud-zookeeper.version>
<spring-cloud-consul.version>2.1.0.RELEASE</spring-cloud-consul.version> <spring-cloud-consul.version>2.1.1.RELEASE</spring-cloud-consul.version>
<curator.version>4.0.1</curator.version> <curator.version>4.0.1</curator.version>
</properties> </properties>

2
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java
View File

@ -68,7 +68,7 @@ public class NacosDiscoveryProperties {
/** /**
* watch delay,duration to pull new service from nacos server. * watch delay,duration to pull new service from nacos server.
*/ */
private long watchDelay = 5000; private long watchDelay = 30000;
/** /**
* nacos naming log file name * nacos naming log file name