Commit 3a328240 by Nepxion

增强黑白名单功能

parent 59a28663
...@@ -50,6 +50,10 @@ public class HostFilterDiscoveryListener extends AbstractDiscoveryListener { ...@@ -50,6 +50,10 @@ public class HostFilterDiscoveryListener extends AbstractDiscoveryListener {
Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap(); Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap();
List<String> filterValueList = filterMap.get(providerServiceId); List<String> filterValueList = filterMap.get(providerServiceId);
if (CollectionUtils.isEmpty(globalFilterValueList) && CollectionUtils.isEmpty(filterValueList)) {
return;
}
List<String> allFilterValueList = new ArrayList<String>(); List<String> allFilterValueList = new ArrayList<String>();
if (CollectionUtils.isNotEmpty(globalFilterValueList)) { if (CollectionUtils.isNotEmpty(globalFilterValueList)) {
allFilterValueList.addAll(globalFilterValueList); allFilterValueList.addAll(globalFilterValueList);
......
...@@ -50,6 +50,10 @@ public class HostFilterLoadBalanceListener extends AbstractLoadBalanceListener { ...@@ -50,6 +50,10 @@ public class HostFilterLoadBalanceListener extends AbstractLoadBalanceListener {
Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap(); Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap();
List<String> filterValueList = filterMap.get(providerServiceId); List<String> filterValueList = filterMap.get(providerServiceId);
if (CollectionUtils.isEmpty(globalFilterValueList) && CollectionUtils.isEmpty(filterValueList)) {
return;
}
List<String> allFilterValueList = new ArrayList<String>(); List<String> allFilterValueList = new ArrayList<String>();
if (CollectionUtils.isNotEmpty(globalFilterValueList)) { if (CollectionUtils.isNotEmpty(globalFilterValueList)) {
allFilterValueList.addAll(globalFilterValueList); allFilterValueList.addAll(globalFilterValueList);
......
...@@ -55,6 +55,10 @@ public class HostFilterRegisterListener extends AbstractRegisterListener { ...@@ -55,6 +55,10 @@ public class HostFilterRegisterListener extends AbstractRegisterListener {
Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap(); Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap();
List<String> filterValueList = filterMap.get(serviceId); List<String> filterValueList = filterMap.get(serviceId);
if (CollectionUtils.isEmpty(globalFilterValueList) && CollectionUtils.isEmpty(filterValueList)) {
return;
}
List<String> allFilterValueList = new ArrayList<String>(); List<String> allFilterValueList = new ArrayList<String>();
if (CollectionUtils.isNotEmpty(globalFilterValueList)) { if (CollectionUtils.isNotEmpty(globalFilterValueList)) {
allFilterValueList.addAll(globalFilterValueList); allFilterValueList.addAll(globalFilterValueList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment