增加对埋点功能的可扩展性，可以支持第三方埋点（例如：CAT）

discovery-plugin-strategy-starter-gateway/src/main/java/com/nepxion/discovery/plugin/strategy/gateway/configuration/GatewayStrategyAutoConfiguration.java

@@ -19,7 +19,6 @@ import org.springframework.context.annotation.Configuration;
 import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledAdapter;
 import com.nepxion.discovery.plugin.strategy.constant.StrategyConstant;
 import com.nepxion.discovery.plugin.strategy.gateway.adapter.DefaultDiscoveryEnabledAdapter;
-import com.nepxion.discovery.plugin.strategy.gateway.context.GatewayStrategyContextHolder;
 import com.nepxion.discovery.plugin.strategy.gateway.filter.GatewayStrategyFilter;
 
 @Configuration
@@ -32,11 +31,6 @@ public class GatewayStrategyAutoConfiguration {
     }
 
     @Bean
-    public GatewayStrategyContextHolder gatewayStrategyContextHolder() {
-        return new GatewayStrategyContextHolder();
-    }
-
-    @Bean
     @ConditionalOnMissingBean
     public DiscoveryEnabledAdapter discoveryEnabledAdapter() {
         return new DefaultDiscoveryEnabledAdapter();

discovery-plugin-strategy-starter-gateway/src/main/java/com/nepxion/discovery/plugin/strategy/gateway/configuration/GatewayStrategyContextAutoConfiguration.java

+package com.nepxion.discovery.plugin.strategy.gateway.configuration;
+
+/**
+ * <p>Title: Nepxion Discovery</p>
+ * <p>Description: Nepxion Discovery</p>
+ * <p>Copyright: Copyright (c) 2017-2050</p>
+ * <p>Company: Nepxion</p>
+ * @author Haojun Ren
+ * @version 1.0
+ */
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.nepxion.discovery.plugin.strategy.gateway.context.GatewayStrategyContextHolder;
+
+@Configuration
+@AutoConfigureBefore(RibbonClientConfiguration.class)
+public class GatewayStrategyContextAutoConfiguration {
+    @Bean
+    public GatewayStrategyContextHolder gatewayStrategyContextHolder() {
+        return new GatewayStrategyContextHolder();
+    }
+}
\ No newline at end of file

discovery-plugin-strategy-starter-gateway/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.nepxion.discovery.plugin.strategy.configuration.StrategyAutoConfiguration,\
-com.nepxion.discovery.plugin.strategy.gateway.configuration.GatewayStrategyAutoConfiguration
+com.nepxion.discovery.plugin.strategy.gateway.configuration.GatewayStrategyAutoConfiguration,\
\ No newline at end of file
+com.nepxion.discovery.plugin.strategy.gateway.configuration.GatewayStrategyContextAutoConfiguration
\ No newline at end of file

discovery-plugin-strategy-starter-service/src/main/java/com/nepxion/discovery/plugin/strategy/service/configuration/ServiceStrategyAutoConfiguration.java

@@ -28,7 +28,6 @@ import com.nepxion.discovery.plugin.strategy.service.aop.RestTemplateStrategyInt
 import com.nepxion.discovery.plugin.strategy.service.aop.RpcStrategyAutoScanProxy;
 import com.nepxion.discovery.plugin.strategy.service.aop.RpcStrategyInterceptor;
 import com.nepxion.discovery.plugin.strategy.service.constant.ServiceStrategyConstant;
-import com.nepxion.discovery.plugin.strategy.service.context.ServiceStrategyContextHolder;
 import com.nepxion.discovery.plugin.strategy.service.wrapper.DefaultCallableWrapper;
 import com.nepxion.discovery.plugin.strategy.wrapper.CallableWrapper;
 
@@ -87,16 +86,12 @@ public class ServiceStrategyAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
+    @ConditionalOnProperty(value = ServiceStrategyConstant.SPRING_APPLICATION_STRATEGY_REST_INTERCEPT_ENABLED, matchIfMissing = false)
     public DiscoveryEnabledAdapter discoveryEnabledAdapter() {
         return new DefaultDiscoveryEnabledAdapter();
     }
 
     @Bean
-    public ServiceStrategyContextHolder serviceStrategyContextHolder() {
-        return new ServiceStrategyContextHolder();
-    }
-
-    @Bean
     @ConditionalOnProperty(value = StrategyConstant.SPRING_APPLICATION_STRATEGY_HYSTRIX_THREADLOCAL_SUPPORTED, matchIfMissing = false)
     public CallableWrapper callableWrapper() {
         return new DefaultCallableWrapper();

discovery-plugin-strategy-starter-service/src/main/java/com/nepxion/discovery/plugin/strategy/service/configuration/ServiceStrategyContextAutoConfiguration.java

+package com.nepxion.discovery.plugin.strategy.service.configuration;
+
+/**
+ * <p>Title: Nepxion Discovery</p>
+ * <p>Description: Nepxion Discovery</p>
+ * <p>Copyright: Copyright (c) 2017-2050</p>
+ * <p>Company: Nepxion</p>
+ * @author Haojun Ren
+ * @version 1.0
+ */
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.nepxion.discovery.plugin.strategy.service.context.ServiceStrategyContextHolder;
+
+@Configuration
+@AutoConfigureBefore(RibbonClientConfiguration.class)
+public class ServiceStrategyContextAutoConfiguration {
+    @Bean
+    public ServiceStrategyContextHolder serviceStrategyContextHolder() {
+        return new ServiceStrategyContextHolder();
+    }
+}
\ No newline at end of file

discovery-plugin-strategy-starter-service/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.nepxion.discovery.plugin.strategy.configuration.StrategyAutoConfiguration,\
-com.nepxion.discovery.plugin.strategy.service.configuration.ServiceStrategyAutoConfiguration
+com.nepxion.discovery.plugin.strategy.service.configuration.ServiceStrategyAutoConfiguration,\
\ No newline at end of file
+com.nepxion.discovery.plugin.strategy.service.configuration.ServiceStrategyContextAutoConfiguration
\ No newline at end of file

discovery-plugin-strategy-starter-zuul/src/main/java/com/nepxion/discovery/plugin/strategy/zuul/configuration/ZuulStrategyAutoConfiguration.java

@@ -20,7 +20,6 @@ import com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledAdapter;
 import com.nepxion.discovery.plugin.strategy.constant.StrategyConstant;
 import com.nepxion.discovery.plugin.strategy.wrapper.CallableWrapper;
 import com.nepxion.discovery.plugin.strategy.zuul.adapter.DefaultDiscoveryEnabledAdapter;
-import com.nepxion.discovery.plugin.strategy.zuul.context.ZuulStrategyContextHolder;
 import com.nepxion.discovery.plugin.strategy.zuul.wrapper.DefaultCallableWrapper;
 
 @Configuration
@@ -34,11 +33,6 @@ public class ZuulStrategyAutoConfiguration {
     }
 
     @Bean
-    public ZuulStrategyContextHolder zuulStrategyContextHolder() {
-        return new ZuulStrategyContextHolder();
-    }
-
-    @Bean
     @ConditionalOnProperty(value = StrategyConstant.SPRING_APPLICATION_STRATEGY_HYSTRIX_THREADLOCAL_SUPPORTED, matchIfMissing = false)
     public CallableWrapper callableWrapper() {
         return new DefaultCallableWrapper();

discovery-plugin-strategy-starter-zuul/src/main/java/com/nepxion/discovery/plugin/strategy/zuul/configuration/ZuulStrategyContextAutoConfiguration.java

+package com.nepxion.discovery.plugin.strategy.zuul.configuration;
+
+/**
+ * <p>Title: Nepxion Discovery</p>
+ * <p>Description: Nepxion Discovery</p>
+ * <p>Copyright: Copyright (c) 2017-2050</p>
+ * <p>Company: Nepxion</p>
+ * @author Haojun Ren
+ * @version 1.0
+ */
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.nepxion.discovery.plugin.strategy.zuul.context.ZuulStrategyContextHolder;
+
+@Configuration
+@AutoConfigureBefore(RibbonClientConfiguration.class)
+public class ZuulStrategyContextAutoConfiguration {
+    @Bean
+    public ZuulStrategyContextHolder zuulStrategyContextHolder() {
+        return new ZuulStrategyContextHolder();
+    }
+}
\ No newline at end of file

discovery-plugin-strategy-starter-zuul/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.nepxion.discovery.plugin.strategy.configuration.StrategyAutoConfiguration,\
-com.nepxion.discovery.plugin.strategy.zuul.configuration.ZuulStrategyAutoConfiguration
+com.nepxion.discovery.plugin.strategy.zuul.configuration.ZuulStrategyAutoConfiguration,\
\ No newline at end of file
+com.nepxion.discovery.plugin.strategy.zuul.configuration.ZuulStrategyContextAutoConfiguration
\ No newline at end of file

discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/configuration/StrategyLoadBalanceConfiguration.java

@@ -43,7 +43,7 @@ public class StrategyLoadBalanceConfiguration {
     @Autowired
     private PluginAdapter pluginAdapter;
 
-    @Autowired
+    @Autowired(required = false)
     private DiscoveryEnabledAdapter discoveryEnabledAdapter;
 
     @Bean

discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/rule/DiscoveryEnabledBasePredicate.java

@@ -27,6 +27,10 @@ public class DiscoveryEnabledBasePredicate extends AbstractServerPredicate {
     }
 
     protected boolean apply(Server server) {
+        if (discoveryEnabledAdapter == null) {
+            return true;
+        }
+
         Map<String, String> metadata = pluginAdapter.getServerMetadata(server);
 
         return discoveryEnabledAdapter.apply(server, metadata);

discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/rule/DiscoveryEnabledZoneAvoidancePredicate.java

@@ -43,6 +43,10 @@ public class DiscoveryEnabledZoneAvoidancePredicate extends ZoneAvoidancePredica
     }
 
     protected boolean apply(Server server) {
+        if (discoveryEnabledAdapter == null) {
+            return true;
+        }
+
         Map<String, String> metadata = pluginAdapter.getServerMetadata(server);
 
         return discoveryEnabledAdapter.apply(server, metadata);