重构类结构

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/strategy/DiscoveryControlStrategy.java

@@ -51,21 +51,31 @@ public class DiscoveryControlStrategy {
     }
 
     private void applyIpAddressFilter(String providerServiceId, List<ServiceInstance> instances) {
-        String ipAddress = pluginCache.get(providerServiceId);
-        if (StringUtils.isNotEmpty(ipAddress)) {
-            String[] filterArray = StringUtils.split(ipAddress, PluginConstant.SEPARATE);
-            List<String> filterList = Arrays.asList(filterArray);
+        String filterIpAddress = pluginCache.get(providerServiceId);
+        if (StringUtils.isNotEmpty(filterIpAddress)) {
             Iterator<ServiceInstance> iterator = instances.iterator();
             while (iterator.hasNext()) {
                 ServiceInstance serviceInstance = iterator.next();
                 String host = serviceInstance.getHost();
-                if (filterList.contains(host)) {
+                boolean valid = validateBlacklist(filterIpAddress, host);
+                if (valid) {
                     iterator.remove();
                 }
             }
         }
     }
 
+    private boolean validateBlacklist(String filterIpAddress, String ipAddress) {
+        String[] filterArray = StringUtils.split(ipAddress, PluginConstant.SEPARATE);
+        for (String filter : filterArray) {
+            if (ipAddress.startsWith(filter)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private void applyVersionFilter(String consumerServiceId, String consumerServiceVersion, String providerServiceId, List<ServiceInstance> instances) {
         // 如果消费端未配置版本号，那么它可以调用提供端所有服务，需要符合规范，极力避免该情况发生
         if (StringUtils.isEmpty(consumerServiceVersion)) {