Update for show encode-zookeeper-node-info

luolluol · Feb 24, 2016 · b3937d9 · b3937d9
1 parent bb9bd9e
commit b3937d9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/dubbokeeper-ui/src/main/java/com/dubboclub/dk/web/controller/ZooPeeperController.java b/dubbokeeper-ui/src/main/java/com/dubboclub/dk/web/controller/ZooPeeperController.java
@@ -4,6 +4,7 @@
 import com.alibaba.dubbo.common.utils.ConfigUtils;
 import com.dubboclub.dk.web.model.SpyZooResponse;
 import com.dubboclub.dk.web.model.SpyZooNode;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.util.*;
 
 /**
@@ -60,6 +62,7 @@ SpyZooResponse listByParent(@RequestParam(value = "parent",defaultValue = "/",re
                 for(String child:children){
                     SpyZooNode node = new SpyZooNode();
                     node.setName(child);
+                    node.setDecodeName(URLDecoder.decode(child, "UTF-8"));
                     node.setParent(parent);
                     node.setNodeStat(zooKeeper.exists((parent.equals("/")?"":parent)+"/"+child,false));
                     if(zooKeeper.getChildren((parent.equals("/")?"":parent)+"/"+child,false).size()>0){

diff --git a/dubbokeeper-ui/src/main/java/com/dubboclub/dk/web/model/SpyZooNode.java b/dubbokeeper-ui/src/main/java/com/dubboclub/dk/web/model/SpyZooNode.java
@@ -13,6 +13,8 @@ public class SpyZooNode {
 
     private String name;
 
+    private String decodeName;
+
     private List<SpyZooNode> childNodes;
 
     private List<SpyZooNode> nodeList;
@@ -50,8 +52,16 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getDecodeName() {
+		return decodeName;
+	}
+
+	public void setDecodeName(String decodeName) {
+		this.decodeName = decodeName;
+	}
 
-    public List<SpyZooNode> getChildNodes() {
+	public List<SpyZooNode> getChildNodes() {
         return childNodes;
     }
 

diff --git a/dubbokeeper-ui/src/main/resources/dubbo.properties b/dubbokeeper-ui/src/main/resources/dubbo.properties
@@ -1,12 +1,12 @@
 dubbo.application.name=common-monitor
 dubbo.application.owner=bieber
-dubbo.registry.address=zookeeper://10.59.32.145:2181
+dubbo.registry.address=zookeeper://10.100.142.63:2181
 
 #use netty4
 dubbo.reference.client=netty4
 
 #peeper config
-peeper.zookeepers=localhost:2181
+peeper.zookeepers=10.100.142.63:2181
 peeper.zookeeper.session.timeout=60000
 
 #logger

diff --git a/dubbokeeper-ui/src/main/resources/webApplication.xml b/dubbokeeper-ui/src/main/resources/webApplication.xml
@@ -14,7 +14,6 @@
 
     <context:component-scan base-package="com.dubboclub.dk.web"/>
 
-
     <mvc:view-controller path="/" view-name="redirect:/index.htm" />
     <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
        <property name="contentNegotiationManager">

diff --git a/dubbokeeper-ui/src/main/webapp/js/libs/angularjs-ui-tree/treeView.js b/dubbokeeper-ui/src/main/webapp/js/libs/angularjs-ui-tree/treeView.js
@@ -4,7 +4,7 @@
 	module.value('treeViewDefaults', {
 		foldersProperty: 'folders',
 		filesProperty: 'files',
-		displayProperty: 'name',
+		displayProperty: 'decodeName',
 		collapsible: true
 	});
 

diff --git a/dubbokeeper-ui/src/main/webapp/templates/zoopeeper/zoopeeper.html b/dubbokeeper-ui/src/main/webapp/templates/zoopeeper/zoopeeper.html
@@ -35,7 +35,7 @@
                                 节点名
                             </td>
                             <td>
-                                {{currentSelectedNode.name}}
+                                {{currentSelectedNode.decodeName}}
                             </td>
                         </tr>
                         <tr>