正在显示
7 个修改的文件
包含
29 行增加
和
4 行删除
| @@ -117,8 +117,13 @@ fabric.properties | @@ -117,8 +117,13 @@ fabric.properties | ||
| 117 | .idea/ | 117 | .idea/ |
| 118 | *.iml | 118 | *.iml |
| 119 | 119 | ||
| 120 | +# Eclipse Project | ||
| 121 | +bin | ||
| 120 | *.project | 122 | *.project |
| 121 | *.settings/ | 123 | *.settings/ |
| 122 | *.classpath | 124 | *.classpath |
| 123 | *.factorypath | 125 | *.factorypath |
| 124 | -.vscode/ | ||
| 126 | +.vscode/ | ||
| 127 | +/.metadata/ | ||
| 128 | + | ||
| 129 | + |
| @@ -23,6 +23,13 @@ public class AppConfiguration { | @@ -23,6 +23,13 @@ public class AppConfiguration { | ||
| 23 | @Value("${server.port}") | 23 | @Value("${server.port}") |
| 24 | private int port; | 24 | private int port; |
| 25 | 25 | ||
| 26 | + @Value("${app.zk.connect.timeout}") | ||
| 27 | + private int zkConnectTimeout; | ||
| 28 | + | ||
| 29 | + public int getZkConnectTimeout() { | ||
| 30 | + return zkConnectTimeout; | ||
| 31 | + } | ||
| 32 | + | ||
| 26 | public int getPort() { | 33 | public int getPort() { |
| 27 | return port; | 34 | return port; |
| 28 | } | 35 | } |
| @@ -30,7 +30,7 @@ public class BeanConfig { | @@ -30,7 +30,7 @@ public class BeanConfig { | ||
| 30 | 30 | ||
| 31 | @Bean | 31 | @Bean |
| 32 | public ZkClient buildZKClient(){ | 32 | public ZkClient buildZKClient(){ |
| 33 | - return new ZkClient(appConfiguration.getZkAddr(), 15000); | 33 | + return new ZkClient(appConfiguration.getZkAddr(), appConfiguration.getZkConnectTimeout()); |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | @Bean | 36 | @Bean |
| @@ -15,6 +15,9 @@ management.security.enabled=false | @@ -15,6 +15,9 @@ management.security.enabled=false | ||
| 15 | # zk 地址 | 15 | # zk 地址 |
| 16 | app.zk.addr=47.98.194.60:2182 | 16 | app.zk.addr=47.98.194.60:2182 |
| 17 | 17 | ||
| 18 | +# zk 连接超时时限 | ||
| 19 | +app.zk.connect.timeout=15000 | ||
| 20 | + | ||
| 18 | # zk 注册根节点 | 21 | # zk 注册根节点 |
| 19 | app.zk.root=/route | 22 | app.zk.root=/route |
| 20 | 23 |
| @@ -30,7 +30,14 @@ public class AppConfiguration { | @@ -30,7 +30,14 @@ public class AppConfiguration { | ||
| 30 | 30 | ||
| 31 | @Value("${cim.heartbeat.time}") | 31 | @Value("${cim.heartbeat.time}") |
| 32 | private long heartBeatTime ; | 32 | private long heartBeatTime ; |
| 33 | - | 33 | + |
| 34 | + @Value("${app.zk.connect.timeout}") | ||
| 35 | + private int zkConnectTimeout; | ||
| 36 | + | ||
| 37 | + public int getZkConnectTimeout() { | ||
| 38 | + return zkConnectTimeout; | ||
| 39 | + } | ||
| 40 | + | ||
| 34 | public String getClearRouteUrl() { | 41 | public String getClearRouteUrl() { |
| 35 | return clearRouteUrl; | 42 | return clearRouteUrl; |
| 36 | } | 43 | } |
| @@ -25,7 +25,7 @@ public class BeanConfig { | @@ -25,7 +25,7 @@ public class BeanConfig { | ||
| 25 | 25 | ||
| 26 | @Bean | 26 | @Bean |
| 27 | public ZkClient buildZKClient(){ | 27 | public ZkClient buildZKClient(){ |
| 28 | - return new ZkClient(appConfiguration.getZkAddr(), 15000); | 28 | + return new ZkClient(appConfiguration.getZkAddr(), appConfiguration.getZkConnectTimeout()); |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
-
请 注册 或 登录 后发表评论