zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#498 fix bug

Browse Source
This commit is contained in:
nkorange 2019-01-15 14:53:30 +08:00
parent 7abee38ff4
commit 705a47e5d2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
View File

@ -474,6 +474,11 @@ public class DomainsManager {
public int getPagedDom(String namespaceId, int startPage, int pageSize, String keyword, List<Domain> domainList) {
List<Domain> matchList;
if (chooseDomMap(namespaceId) == null) {
return 0;
}
if (StringUtils.isNotBlank(keyword)) {
matchList = searchDomains(namespaceId, ".*" + keyword + ".*");
} else {

2
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
View File

@ -82,7 +82,7 @@ public class ClientBeatCheckTask implements Runnable {
+ ipAddress.getWeight() + "_" + ipAddress.getClusterName();
String url = "http://127.0.0.1:" + RunningConfig.getServerPort() + RunningConfig.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + "/api/remvIP4Dom?dom="
+ domain.getName() + "&ipList=" + ipList + "&token=" + domain.getToken();
+ domain.getName() + "&ipList=" + ipList + "&token=" + domain.getToken() + "&namespaceId=" + domain.getNamespaceId();
HttpClient.HttpResult result = HttpClient.httpGet(url, null, null);
if (result.code != HttpURLConnection.HTTP_OK) {
Loggers.SRV_LOG.error("[IP-DEAD] failed to delete ip automatically, ip: {}, caused {}, resp code: {}",