From a38b8c103031066c9e5720b09f8d0ad5087854de Mon Sep 17 00:00:00 2001
From: tanghc <thc8719@163.com>
Date: Fri, 15 Mar 2019 21:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/BaseRouteManager.java             | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/BaseRouteManager.java b/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/BaseRouteManager.java
index 67809160..2b2f6be6 100644
--- a/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/BaseRouteManager.java
+++ b/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/BaseRouteManager.java
@@ -24,10 +24,10 @@ import static com.gitee.sop.gatewaycommon.bean.SopConstants.SOP_SERVICE_ROUTE_PA
  * 路由管理，采用zookeeper实现，监听路由的增删改，并适时更新到本地。路由的存储格式为：
  * <pre>
  * /sop-service-route  根节点
- * /serviceId       服务节点，名字为服务名
- * /route1      路由节点，名字为：name+version，存放路由信息
- * /route2
- * /...
+ *      /serviceId       服务节点，名字为服务名
+ *          /route1      路由节点，名字为：name+version，存放路由信息
+ *          /route2
+ *          /...
  * </pre>
  *
  * @param <R> 路由根对象，可以理解为最外面的大json：{....,routeDefinitionList:[]}
@@ -74,7 +74,6 @@ public abstract class BaseRouteManager<R extends BaseServiceRouteInfo<E>, E exte
 
     @Override
     public void refresh() {
-        log.info("刷新本地接口信息");
         try {
             String zookeeperServerAddr = environment.getProperty("spring.cloud.zookeeper.connect-string");
             if (StringUtils.isEmpty(zookeeperServerAddr)) {
@@ -104,13 +103,13 @@ public abstract class BaseRouteManager<R extends BaseServiceRouteInfo<E>, E exte
      * 监听微服务更改
      *
      * @param client
-     * @param sopServiceApiPath
+     * @param sopRouteRootPath
      * @throws Exception
      */
-    protected void watchServiceChange(CuratorFramework client, String sopServiceApiPath) throws Exception {
+    protected void watchServiceChange(CuratorFramework client, String sopRouteRootPath) throws Exception {
         // 为子节点添加watcher
         // PathChildrenCache: 监听数据节点的增删改，可以设置触发的事件
-        PathChildrenCache childrenCache = new PathChildrenCache(client, sopServiceApiPath, true);
+        PathChildrenCache childrenCache = new PathChildrenCache(client, sopRouteRootPath, true);
 
         /**
          * StartMode: 初始化方式
@@ -123,7 +122,7 @@ public abstract class BaseRouteManager<R extends BaseServiceRouteInfo<E>, E exte
         // 列出子节点数据列表，需要使用BUILD_INITIAL_CACHE同步初始化模式才能获得，异步是获取不到的
         List<ChildData> childDataList = childrenCache.getCurrentData();
         log.info("========== 加载路由信息 ==========");
-        log.info("{}  # 根节点", sopRouteRootPath);
+        log.info("{}  # 根节点", this.sopRouteRootPath);
         for (ChildData childData : childDataList) {
             String serviceNodeData = new String(childData.getData());
             R serviceRouteInfo = JSON.parseObject(serviceNodeData, getServiceRouteInfoClass());
@@ -131,7 +130,7 @@ public abstract class BaseRouteManager<R extends BaseServiceRouteInfo<E>, E exte
             log.info("\t{}  # service节点，节点数据:{}", servicePath, serviceNodeData);
             this.loadServiceRouteItem(client, serviceRouteInfo, servicePath);
         }
-        log.info("监听服务节点增删改，rootPath:{}", sopRouteRootPath);
+        log.info("监听服务节点增删改，rootPath:{}", this.sopRouteRootPath);
         // 监听根节点下面的子节点
         childrenCache.getListenable().addListener(new PathChildrenCacheListener() {
             @Override