From 7909f60ff81db95d2177777763c6a4a5c32d91bb Mon Sep 17 00:00:00 2001 From: wangyaobo <“jiaopeishun_i@didiglobal.com”> Date: Mon, 5 Sep 2022 15:40:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djmx=20ip=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../know/streaming/km/common/bean/entity/broker/Broker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d7e3b792..fa67cac5 100644 --- 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 class Broker implements Serializable { return host; } IpPortData ip = endpointMap.get(endPoint); - return ip == null ? ip.getIp() : host; + return ip != null ? ip.getIp() : host; } public boolean alive() { From dfe8d094774fde54ceadcc3ccc624b59247fedf2 Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Mon, 5 Sep 2022 16:53:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=94=81=E5=AE=9A=20tree-changes=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- km-console/packages/layout-clusters-fe/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/km-console/packages/layout-clusters-fe/package.json b/km-console/packages/layout-clusters-fe/package.json index 8ee1130f..088c55fd 100644 --- 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",