Merge pull request #558 from didi/master

合并主分支
didi · Sep 5, 2022 · 1335414 · 1335414
2 parents 0b376bd + 2de2771
commit 1335414
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...mmon/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/broker/Broker.java b/...mmon/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/broker/Broker.java
@@ -111,7 +111,7 @@ public String getJmxHost(String endPoint) {
             return host;
         }
         IpPortData ip = endpointMap.get(endPoint);
-        return ip == null ? ip.getIp() : host;
+        return ip != null ? ip.getIp() : host;
     }
 
     public boolean alive() {

diff --git a/km-console/packages/layout-clusters-fe/package.json b/km-console/packages/layout-clusters-fe/package.json
@@ -59,7 +59,8 @@
     "single-spa": "5.9.3",
     "single-spa-react": "2.14.0",
     "webpack-bundle-analyzer": "^4.5.0",
-    "knowdesign": "1.3.7"
+    "knowdesign": "1.3.7",
+    "tree-changes": "0.9.1"
   },
   "devDependencies": {
     "@babel/core": "^7.5.5",