更改缓存机制

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/AdminEndpoint.java

@@ -31,10 +31,8 @@ import org.springframework.jmx.export.annotation.ManagedResource;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.nepxion.discovery.plugin.framework.cache.PluginCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
 import com.nepxion.discovery.plugin.framework.exception.PluginException;
@@ -52,9 +50,6 @@ public class AdminEndpoint extends AbstractMvcEndpoint implements ApplicationCon
     private Registration registration;
 
     @Autowired
-    private PluginCache pluginCache;
-
-    @Autowired
     private PluginPublisher pluginPublisher;
 
     @SuppressWarnings("rawtypes")
@@ -88,48 +83,6 @@ public class AdminEndpoint extends AbstractMvcEndpoint implements ApplicationCon
             throw new PluginException("To input stream failed", e);
         }
 
-        LOG.info("receive config successfully");
-
-        return "success";
-    }
-
-    @RequestMapping(path = "blacklist", method = RequestMethod.GET)
-    @ResponseBody
-    @ManagedOperation
-    public Object blacklist(@RequestParam("serviceId") String serviceId, @RequestParam("ip") String ip) {
-        Boolean discoveryControlEnabled = getEnvironment().getProperty(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
-        if (!discoveryControlEnabled) {
-            return new ResponseEntity<>(Collections.singletonMap("Message", "Discovery control is disabled"), HttpStatus.NOT_FOUND);
-        }
-
-        if (registration == null) {
-            throw new PluginException("No registration found");
-        }
-
-        pluginCache.put(serviceId, ip);
-
-        LOG.info("Add blacklist for serviceId={}, ip={} successfully", serviceId, ip);
-
-        return "success";
-    }
-
-    @RequestMapping(path = "clear", method = RequestMethod.GET)
-    @ResponseBody
-    @ManagedOperation
-    public Object clear(@RequestParam("serviceId") String serviceId) {
-        Boolean discoveryControlEnabled = getEnvironment().getProperty(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
-        if (!discoveryControlEnabled) {
-            return new ResponseEntity<>(Collections.singletonMap("Message", "Discovery control is disabled"), HttpStatus.NOT_FOUND);
-        }
-
-        if (registration == null) {
-            throw new PluginException("No registration found");
-        }
-
-        pluginCache.clear(serviceId);
-
-        LOG.info("Clear blacklist for serviceId={} successfully", serviceId);
-
         return "success";
     }
 

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/configuration/PluginAutoConfiguration.java

@@ -14,7 +14,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.nepxion.discovery.plugin.framework.cache.PluginCache;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
 import com.nepxion.discovery.plugin.framework.strategy.DiscoveryControlStrategy;
@@ -42,11 +41,6 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
-    public PluginCache pluginCache() {
-        return new PluginCache();
-    }
-
-    @Bean
     public PluginPublisher pluginPublisher() {
         return new PluginPublisher();
     }

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

@@ -21,7 +21,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
 
-import com.nepxion.discovery.plugin.framework.cache.PluginCache;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
@@ -35,9 +34,6 @@ public class DiscoveryControlStrategy {
     private RuleEntity ruleEntity;
 
     @Autowired
-    private PluginCache pluginCache;
-
-    @Autowired
     private ReentrantReadWriteLock reentrantReadWriteLock;
 
     public void apply(String consumerServiceId, String consumerServiceVersion, String providerServiceId, List<ServiceInstance> instances) {