升级Spring Cloud到Edgware版

discovery-springcloud-example/pom.xml

@@ -39,8 +39,8 @@
     <dependencies>
         <dependency>
             <groupId>com.nepxion</groupId>
-            <!-- <artifactId>discovery-plugin-starter-eureka</artifactId> -->
-            <artifactId>discovery-plugin-starter-consul</artifactId>
+            <artifactId>discovery-plugin-starter-eureka</artifactId>
+            <!-- <artifactId>discovery-plugin-starter-consul</artifactId> -->
             <!-- <artifactId>discovery-plugin-starter-zookeeper</artifactId> -->
             <version>${discovery.plugin.version}</version>
         </dependency>

discovery-springcloud-example/src/main/resources/bootstrap.properties

@@ -14,6 +14,10 @@ spring.cloud.zookeeper.connectString=localhost:2181
 spring.cloud.zookeeper.discovery.root=/spring-cloud-service
 spring.cloud.zookeeper.discovery.preferIpAddress=true
 
+# Ribbon config
+ribbon.ReadTimeout=60000
+ribbon.ConnectTimeout=60000
+
 # Admin config（management.health.consul.enabled必须配置在bootstrap.properties里，配置在application.properties无效）
 management.security.enabled=false
 # management.health.consul.enabled=true