Merge pull request #29 from GinRyan/master

自定义 Zookeeper 连接超时时间

@@ -117,8 +117,13 @@ fabric.properties
 .idea/
 *.iml
 
+# Eclipse Project 
+bin
 *.project
 *.settings/
 *.classpath
 *.factorypath
-.vscode/
\ No newline at end of file
+.vscode/
+/.metadata/
+
+

@@ -23,6 +23,13 @@ public class AppConfiguration {
     @Value("${server.port}")
     private int port;
 
+    @Value("${app.zk.connect.timeout}")
+    private int zkConnectTimeout;
+    
+    public int getZkConnectTimeout() {
+		return zkConnectTimeout;
+	}
+    
     public int getPort() {
         return port;
     }

@@ -30,7 +30,7 @@ public class BeanConfig {
 
     @Bean
     public ZkClient buildZKClient(){
-        return new ZkClient(appConfiguration.getZkAddr(), 5000);
+        return new ZkClient(appConfiguration.getZkAddr(), appConfiguration.getZkConnectTimeout());
     }
 
     @Bean

@@ -15,6 +15,9 @@ management.security.enabled=false
 # zk 地址
 app.zk.addr=47.98.194.60:2182
 
+# zk 连接超时时限
+app.zk.connect.timeout=15000
+
 # zk 注册根节点
 app.zk.root=/route
 

@@ -30,7 +30,14 @@ public class AppConfiguration {
 
     @Value("${cim.heartbeat.time}")
     private long heartBeatTime ;
-
+    
+    @Value("${app.zk.connect.timeout}")
+    private int zkConnectTimeout;
+    
+    public int getZkConnectTimeout() {
+		return zkConnectTimeout;
+	}
+    
     public String getClearRouteUrl() {
         return clearRouteUrl;
     }

@@ -25,7 +25,7 @@ public class BeanConfig {
 
     @Bean
     public ZkClient buildZKClient(){
-        return new ZkClient(appConfiguration.getZkAddr(), 5000);
+        return new ZkClient(appConfiguration.getZkAddr(), appConfiguration.getZkConnectTimeout());
     }
 
     /**

@@ -27,6 +27,9 @@ app.zk.switch=true
 # zk 地址
 app.zk.addr=47.98.194.60:2182
 
+# zk 连接超时时限
+app.zk.connect.timeout=15000
+
 # zk 注册根节点
 app.zk.root=/route