8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 11:52:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #558 from didi/master

Browse Source 
合并主分支
This commit is contained in:
EricZeng
2022-09-05 17:08:51 +08:00
committed by GitHub
parent 0b376bd69c 2de27719c1
commit 13354145fc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/broker/Broker.java
View File

@@ -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() {

3
km-console/packages/layout-clusters-fe/package.json
View File

@@ -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",