Merge pull request #558 from didi/master

ZQKC · web-flow · commit 13354145fcee · 2022-09-05T17:08:51.000+08:00
合并主分支
diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/broker/Broker.java b/km-common/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",

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public String getJmxHost(String endPoint) {`
`111`	`111`	`return host;`
`112`	`112`	`}`
`113`	`113`	`IpPortData ip = endpointMap.get(endPoint);`
`114`		`- return ip == null ? ip.getIp() : host;`
	`114`	`+ return ip != null ? ip.getIp() : host;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public boolean alive() {`