重构类结构

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

@@ -123,7 +123,7 @@ public class RouterEndpoint implements MvcEndpoint {
     }
 
     public RouterEntity getRouterEntity() {
-        String serviceId = pluginContextAware.getServiceId();
+        String serviceId = pluginAdapter.getServiceId();
         String version = pluginAdapter.getVersion();
         String host = pluginAdapter.getIpAddress(registration);
         int port = pluginAdapter.getPort(registration);

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/AbstractPluginAdapter.java

@@ -24,6 +24,11 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
     protected PluginCache pluginCache;
 
     @Override
+    public String getServiceId() {
+        return pluginContextAware.getEnvironment().getProperty(PluginConstant.SPRING_APPLICATION_NAME);
+    }
+
+    @Override
     public String getVersion() {
         String dynamicVersion = getDynamicVersion();
         if (StringUtils.isNotEmpty(dynamicVersion)) {

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/PluginAdapter.java

@@ -14,6 +14,8 @@ import org.springframework.cloud.client.serviceregistry.Registration;
 import com.netflix.loadbalancer.Server;
 
 public interface PluginAdapter {
+    String getServiceId();
+
     String getIpAddress(Registration registration);
 
     int getPort(Registration registration);

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/context/PluginContextAware.java

@@ -84,10 +84,6 @@ public class PluginContextAware implements ApplicationContextAware {
         return environment;
     }
 
-    public String getServiceId() {
-        return environment.getProperty(PluginConstant.SPRING_APPLICATION_NAME);
-    }
-
     public Boolean isRegisterControlEnabled() {
         return isRegisterControlEnabled(environment);
     }

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/VersionFilterDiscoveryListener.java

@@ -28,7 +28,7 @@ import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
 public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
     @Override
     public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
-        String consumerServiceId = pluginContextAware.getServiceId();
+        String consumerServiceId = pluginAdapter.getServiceId();
         String consumerServiceVersion = pluginAdapter.getVersion();
 
         applyVersionFilter(consumerServiceId, consumerServiceVersion, serviceId, instances);

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/VersionFilterLoadBalanceListener.java

@@ -28,7 +28,7 @@ import com.netflix.loadbalancer.Server;
 public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListener {
     @Override
     public void onGetServers(String serviceId, List<? extends Server> servers) {
-        String consumerServiceId = pluginContextAware.getServiceId();
+        String consumerServiceId = pluginAdapter.getServiceId();
         String consumerServiceVersion = pluginAdapter.getVersion();
 
         applyVersionFilter(consumerServiceId, consumerServiceVersion, serviceId, servers);