增加Plugin到Metadata上

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

@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.framework.adapter.ConsulAdapter;
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
+import com.nepxion.discovery.plugin.framework.constant.ConsulConstant;
 
 @Configuration
 @RibbonClients(defaultConfiguration = { PluginLoadBalanceConfiguration.class, ConsulLoadBalanceConfiguration.class })
@@ -29,7 +30,7 @@ public class ConsulAutoConfiguration {
         System.out.println("╚═══╩╩══╩══╩══╝╚╝╚══╩╝╚═╗╔╝");
         System.out.println("                      ╔═╝║");
         System.out.println("                      ╚══╝");
-        System.out.println("Nepxion Discovery - Consul Plugin  v4.0.5");
+        System.out.println("Nepxion Discovery - " + ConsulConstant.DISCOVERY_PLUGIN + "  v4.0.5");
         System.out.println("");
     }
 

discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/constant/ConsulConstant.java

@@ -11,4 +11,6 @@ package com.nepxion.discovery.plugin.framework.constant;
 
 public class ConsulConstant {
     public static final String METADATA_VERSION = "spring.cloud.consul.discovery.tags";
+
+    public static final String DISCOVERY_PLUGIN = "Consul Plugin";
 }
\ No newline at end of file

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

@@ -10,9 +10,12 @@ package com.nepxion.discovery.plugin.framework.context;
  */
 
 import org.springframework.beans.BeansException;
+import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
 import org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistry;
 import org.springframework.context.ConfigurableApplicationContext;
 
+import com.nepxion.discovery.plugin.framework.constant.ConsulConstant;
+import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.decorator.ConsulServiceRegistryDecorator;
 
 public class ConsulApplicationContextInitializer extends PluginApplicationContextInitializer {
@@ -22,11 +25,12 @@ public class ConsulApplicationContextInitializer extends PluginApplicationContex
             ConsulServiceRegistry consulServiceRegistry = (ConsulServiceRegistry) bean;
 
             return new ConsulServiceRegistryDecorator(consulServiceRegistry, applicationContext);
-        /*} else if (bean instanceof ConsulDiscoveryProperties) {
+        } else if (bean instanceof ConsulDiscoveryProperties) {
             ConsulDiscoveryProperties consulDiscoveryProperties = (ConsulDiscoveryProperties) bean;
             consulDiscoveryProperties.setPreferIpAddress(true);
+            consulDiscoveryProperties.getTags().add(PluginConstant.DISCOVERY_PLUGIN + "=" + ConsulConstant.DISCOVERY_PLUGIN);
 
-            return bean;*/
+            return bean;
         } else {
             return bean;
         }

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

@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.framework.adapter.EurekaAdapter;
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
+import com.nepxion.discovery.plugin.framework.constant.EurekaConstant;
 
 @Configuration
 @RibbonClients(defaultConfiguration = { PluginLoadBalanceConfiguration.class, EurekaLoadBalanceConfiguration.class })
@@ -29,7 +30,7 @@ public class EurekaAutoConfiguration {
         System.out.println("╚═══╩╩══╩══╩══╝╚╝╚══╩╝╚═╗╔╝");
         System.out.println("                      ╔═╝║");
         System.out.println("                      ╚══╝");
-        System.out.println("Nepxion Discovery - Eureka Plugin  v4.0.5");
+        System.out.println("Nepxion Discovery - " + EurekaConstant.DISCOVERY_PLUGIN + "  v4.0.5");
         System.out.println("");
     }
 

discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/constant/EurekaConstant.java

@@ -11,4 +11,6 @@ package com.nepxion.discovery.plugin.framework.constant;
 
 public class EurekaConstant {
     public static final String METADATA_VERSION = "eureka.instance.metadataMap.version";
+
+    public static final String DISCOVERY_PLUGIN = "Eureka Plugin";
 }
\ No newline at end of file

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

@@ -10,9 +10,12 @@ package com.nepxion.discovery.plugin.framework.context;
  */
 
 import org.springframework.beans.BeansException;
+import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
 import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry;
 import org.springframework.context.ConfigurableApplicationContext;
 
+import com.nepxion.discovery.plugin.framework.constant.EurekaConstant;
+import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.decorator.EurekaServiceRegistryDecorator;
 
 public class EurekaApplicationContextInitializer extends PluginApplicationContextInitializer {
@@ -22,11 +25,12 @@ public class EurekaApplicationContextInitializer extends PluginApplicationContex
             EurekaServiceRegistry eurekaServiceRegistry = (EurekaServiceRegistry) bean;
 
             return new EurekaServiceRegistryDecorator(eurekaServiceRegistry, applicationContext);
-        /*} else if (bean instanceof EurekaInstanceConfigBean) {
+        } else if (bean instanceof EurekaInstanceConfigBean) {
             EurekaInstanceConfigBean eurekaInstanceConfig = (EurekaInstanceConfigBean) bean;
             eurekaInstanceConfig.setPreferIpAddress(true);
+            eurekaInstanceConfig.getMetadataMap().put(PluginConstant.DISCOVERY_PLUGIN, EurekaConstant.DISCOVERY_PLUGIN);
 
-            return bean;*/
+            return bean;
         } else {
             return bean;
         }

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

@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 import com.nepxion.discovery.plugin.framework.adapter.ZookeeperAdapter;
+import com.nepxion.discovery.plugin.framework.constant.ZookeeperConstant;
 
 @Configuration
 @RibbonClients(defaultConfiguration = { PluginLoadBalanceConfiguration.class, ZookeeperLoadBalanceConfiguration.class })
@@ -29,7 +30,7 @@ public class ZookeeperAutoConfiguration {
         System.out.println("╚═══╩╩══╩══╩══╝╚╝╚══╩╝╚═╗╔╝");
         System.out.println("                      ╔═╝║");
         System.out.println("                      ╚══╝");
-        System.out.println("Nepxion Discovery - Zookeeper Plugin  v4.0.5");
+        System.out.println("Nepxion Discovery - " + ZookeeperConstant.DISCOVERY_PLUGIN + "  v4.0.5");
         System.out.println("");
     }
 

discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/constant/ZookeeperConstant.java

@@ -11,4 +11,6 @@ package com.nepxion.discovery.plugin.framework.constant;
 
 public class ZookeeperConstant {
     public static final String METADATA_VERSION = "spring.cloud.zookeeper.discovery.metadata.version";
+
+    public static final String DISCOVERY_PLUGIN = "Zookeeper Plugin";
 }
\ No newline at end of file

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

@@ -10,9 +10,12 @@ package com.nepxion.discovery.plugin.framework.context;
  */
 
 import org.springframework.beans.BeansException;
+import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
 import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperServiceRegistry;
 import org.springframework.context.ConfigurableApplicationContext;
 
+import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
+import com.nepxion.discovery.plugin.framework.constant.ZookeeperConstant;
 import com.nepxion.discovery.plugin.framework.decorator.ZookeeperServiceRegistryDecorator;
 
 public class ZookeeperApplicationContextInitializer extends PluginApplicationContextInitializer {
@@ -22,11 +25,12 @@ public class ZookeeperApplicationContextInitializer extends PluginApplicationCon
             ZookeeperServiceRegistry zookeeperServiceRegistry = (ZookeeperServiceRegistry) bean;
 
             return new ZookeeperServiceRegistryDecorator(zookeeperServiceRegistry, applicationContext);
-        /*} else if (bean instanceof ZookeeperDiscoveryProperties) {
+        } else if (bean instanceof ZookeeperDiscoveryProperties) {
             ZookeeperDiscoveryProperties zookeeperDiscoveryProperties = (ZookeeperDiscoveryProperties) bean;
             zookeeperDiscoveryProperties.setPreferIpAddress(true);
+            zookeeperDiscoveryProperties.getMetadata().put(PluginConstant.DISCOVERY_PLUGIN, ZookeeperConstant.DISCOVERY_PLUGIN);
 
-            return bean;*/
+            return bean;
         } else {
             return bean;
         }

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/constant/PluginConstant.java

@@ -10,6 +10,8 @@ package com.nepxion.discovery.plugin.framework.constant;
  */
 
 public class PluginConstant {
+    public static final String DISCOVERY_PLUGIN = "discovery.plugin";
+
     public static final String SPRING_APPLICATION_REGISTER_CONTROL_ENABLED = "spring.application.register.control.enabled";
     public static final String SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED = "spring.application.discovery.control.enabled";