修改启动开关

saleson · saleson · commit 4b3879ad236c · 2019-05-25T19:02:08.000+08:00
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/GrayClientEurekaAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/GrayClientEurekaAutoConfiguration.java
@@ -1,5 +1,6 @@
 package cn.springcloud.gray.client.netflix.configuration;
 
+import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.InstanceLocalInfo;
 import cn.springcloud.gray.client.netflix.eureka.EurekaInstanceDiscoveryClient;
 import cn.springcloud.gray.client.netflix.eureka.EurekaServerExplainer;
@@ -15,7 +16,7 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnBean(EurekaClient.class)
+@ConditionalOnBean({GrayManager.class, EurekaClient.class})
 public class GrayClientEurekaAutoConfiguration {
 
     @Autowired
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayAutoConfiguration.java
@@ -11,6 +11,7 @@
 import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
 import feign.hystrix.HystrixFeign;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -22,6 +23,7 @@
 import java.io.IOException;
 
 @Configuration
+@ConditionalOnBean(GrayManager.class)
 @ConditionalOnClass({HystrixCommand.class, HystrixFeign.class})
 public class HystrixGrayAutoConfiguration {
 
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixGrayAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixGrayAutoConfiguration.java
@@ -6,12 +6,14 @@
 import cn.springcloud.gray.client.netflix.ribbon.configuration.GrayRibbonClientsConfiguration;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@ConditionalOnBean(GrayManager.class)
 @RibbonClients(defaultConfiguration = GrayRibbonClientsConfiguration.class)
 public class NetflixGrayAutoConfiguration {
 
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/feign/configuration/GrayFeignAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/feign/configuration/GrayFeignAutoConfiguration.java
@@ -1,10 +1,12 @@
 package cn.springcloud.gray.client.netflix.feign.configuration;
 
+import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.client.netflix.configuration.HystrixGrayAutoConfiguration;
 import cn.springcloud.gray.client.netflix.feign.GrayTrackFeignRequestInterceptor;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import com.netflix.loadbalancer.ILoadBalancer;
 import feign.Feign;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
@@ -14,8 +16,9 @@
 /**
  * Created by saleson on 2017/11/9.
  */
-@ConditionalOnClass(value = {ILoadBalancer.class, Feign.class})
 @Configuration
+@ConditionalOnBean(GrayManager.class)
+@ConditionalOnClass(value = {ILoadBalancer.class, Feign.class})
 @EnableFeignClients(defaultConfiguration = {GrayFeignClientsConfiguration.class})
 public class GrayFeignAutoConfiguration {
 
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/resttemplate/configuration/GrayRestTemplateAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/resttemplate/configuration/GrayRestTemplateAutoConfiguration.java
@@ -1,13 +1,13 @@
 package cn.springcloud.gray.client.netflix.resttemplate.configuration;
 
+import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
 import cn.springcloud.gray.client.netflix.connectionpoint.RibbonConnectionPoint;
 import cn.springcloud.gray.client.netflix.resttemplate.GrayClientHttpRequestIntercptor;
 import cn.springcloud.gray.client.netflix.resttemplate.RestTemplateRequestInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
@@ -17,44 +17,25 @@
 import java.util.List;
 
 @Configuration
-@ConditionalOnClass(value = RestTemplate.class)
+@ConditionalOnBean({GrayManager.class, RestTemplate.class})
+@ConditionalOnClass(value = {RestTemplate.class, LoadBalanced.class})
 public class GrayRestTemplateAutoConfiguration {
 
+    @Autowired
+    private GrayRequestProperties grayRequestProperties;
+    @Autowired
+    private RibbonConnectionPoint ribbonConnectionPoint;
 
-    @ConditionalOnMissingBean(RestTemplate.class)
-    @ConditionalOnClass({LoadBalanced.class})
-    public static class LoadBalancedRestTemplateConfiguration {
 
-        @Autowired
-        private GrayRequestProperties grayRequestProperties;
-        @Autowired
-        private RibbonConnectionPoint ribbonConnectionPoint;
-
-        @Bean
-        @LoadBalanced
-        public RestTemplate restTemplate() {
-            RestTemplate restTemplate = new RestTemplate();
-            return restTemplate;
-        }
-
-        @Bean
-        public GrayClientHttpRequestIntercptor grayClientHttpRequestIntercptor(@LoadBalanced List<RestTemplate> restTemplates) {
-            GrayClientHttpRequestIntercptor intercptor = new GrayClientHttpRequestIntercptor(
-                    grayRequestProperties, ribbonConnectionPoint);
+    @Bean
+    public GrayClientHttpRequestIntercptor grayClientHttpRequestIntercptor(
+            @Autowired(required = false) @LoadBalanced List<RestTemplate> restTemplates) {
+        GrayClientHttpRequestIntercptor intercptor = new GrayClientHttpRequestIntercptor(
+                grayRequestProperties, ribbonConnectionPoint);
+        if (restTemplates != null) {
             restTemplates.forEach(restTemplate -> restTemplate.getInterceptors().add(intercptor));
-            return intercptor;
-        }
-    }
-
-
-    @ConditionalOnMissingBean(RestTemplate.class)
-    @ConditionalOnMissingClass({"org.springframework.cloud.client.loadbalancer.LoadBalanced"})
-    public static class RestTemplateConfiguration {
-        @Bean
-        public RestTemplate restTemplate() {
-            RestTemplate restTemplate = new RestTemplate();
-            return restTemplate;
         }
+        return intercptor;
     }
 
 
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/zuul/configuration/GrayZuulAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/zuul/configuration/GrayZuulAutoConfiguration.java
@@ -1,5 +1,6 @@
 package cn.springcloud.gray.client.netflix.zuul.configuration;
 
+import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
 import cn.springcloud.gray.client.netflix.configuration.HystrixGrayAutoConfiguration;
 import cn.springcloud.gray.client.netflix.connectionpoint.RibbonConnectionPoint;
@@ -8,12 +9,14 @@
 import cn.springcloud.gray.client.netflix.zuul.ZuulRequestInterceptor;
 import com.netflix.zuul.http.ZuulServlet;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@ConditionalOnBean(GrayManager.class)
 @ConditionalOnClass(value = ZuulServlet.class)
 public class GrayZuulAutoConfiguration {
 
diff --git a/spring-cloud-gray-client/pom.xml b/spring-cloud-gray-client/pom.xml
@@ -63,6 +63,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-stream</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-commons</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/EnableGrayClient.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/EnableGrayClient.java
@@ -1,14 +1,15 @@
 package cn.springcloud.gray.client;
 
-import cn.springcloud.gray.client.config.GrayClientMarkerConfiguration;
+import cn.springcloud.gray.client.config.GrayClientImportSelector;
 import org.springframework.context.annotation.Import;
 
 import java.lang.annotation.*;
 
-@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Import(GrayClientMarkerConfiguration.class)
+@Inherited
+@Import(GrayClientImportSelector.class)
 public @interface EnableGrayClient {
 
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientAutoConfiguration.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientAutoConfiguration.java
@@ -12,7 +12,6 @@
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.request.ThreadLocalRequestStorage;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -25,7 +24,8 @@
 
 @Configuration
 @EnableConfigurationProperties({GrayClientProperties.class, GrayRequestProperties.class})
-@ConditionalOnBean(GrayClientMarkerConfiguration.GrayClientMarker.class)
+//@ConditionalOnBean(GrayClientMarkerConfiguration.GrayClientMarker.class)
+@ConditionalOnProperty(value = "gray.enabled")
 @Import({GrayDecisionFactoryConfiguration.class, GrayTrackConfiguration.class})
 public class GrayClientAutoConfiguration {
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientBeanPostProcessorConfiguration.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientBeanPostProcessorConfiguration.java
@@ -1,13 +1,16 @@
 package cn.springcloud.gray.client.config;
 
+import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.InstanceLocalInfo;
 import cn.springcloud.gray.InstanceLocalInfoAware;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@ConditionalOnBean(GrayManager.class)
 public class GrayClientBeanPostProcessorConfiguration {
 
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientImportSelector.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientImportSelector.java
@@ -0,0 +1,50 @@
+package cn.springcloud.gray.client.config;
+
+
+import cn.springcloud.gray.client.EnableGrayClient;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.cloud.commons.util.SpringFactoryImportSelector;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.type.AnnotationMetadata;
+
+import java.util.Properties;
+
+@Order(Ordered.LOWEST_PRECEDENCE - 100)
+public class GrayClientImportSelector extends SpringFactoryImportSelector<EnableGrayClient> {
+
+
+    @Override
+    public String[] selectImports(AnnotationMetadata metadata) {
+        String[] imports = super.selectImports(metadata);
+
+        Environment env = getEnvironment();
+        String grayEnabled = env.getProperty("gray.enabled");
+        if (StringUtils.isEmpty(grayEnabled)) {
+            if (ConfigurableEnvironment.class.isInstance(env)) {
+                ConfigurableEnvironment environment = (ConfigurableEnvironment) env;
+                MutablePropertySources m = environment.getPropertySources();
+                Properties p = new Properties();
+                p.put("gray.enabled", "true");
+                m.addLast(new PropertiesPropertySource("defaultProperties", p));
+            }
+        }
+
+        return imports;
+    }
+
+
+    @Override
+    protected boolean isEnabled() {
+        return false;
+    }
+
+    @Override
+    protected boolean hasDefaultFactory() {
+        return true;
+    }
+}
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientMarkerConfiguration.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientMarkerConfiguration.java
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientWebConfiguration.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientWebConfiguration.java
@@ -1,10 +1,19 @@
 package cn.springcloud.gray.client.config;
 
 
+import cn.springcloud.gray.GrayManager;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(basePackages = {"cn.springcloud.gray.web.resources"})
+@ConditionalOnBean(GrayManager.class)
 public class GrayClientWebConfiguration {
+
+
+    @Configuration
+    @ComponentScan(basePackages = {"cn.springcloud.gray.web.resources"})
+    public static class GrayClientResourcesConfiguration {
+
+    }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayEventAutoConfiguration.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayEventAutoConfiguration.java
@@ -1,11 +1,13 @@
 package cn.springcloud.gray.client.config;
 
 import cn.springcloud.gray.CommunicableGrayManager;
+import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.event.DefaultGrayEventListener;
 import cn.springcloud.gray.event.GrayEventListener;
 import cn.springcloud.gray.event.stream.StreamInput;
 import cn.springcloud.gray.event.stream.StreamMessageListener;
 import cn.springcloud.gray.request.track.CommunicableGrayTrackHolder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -14,6 +16,7 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@ConditionalOnBean(GrayManager.class)
 public class GrayEventAutoConfiguration {
 
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayLoadAutoConfigration.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayLoadAutoConfigration.java
@@ -5,13 +5,15 @@
 import cn.springcloud.gray.model.GrayStatus;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @ConditionalOnProperty(value = "gray.load.enabled", havingValue = "true")
+@ConditionalOnBean(GrayManager.class)
 @EnableConfigurationProperties({GrayLoadProperties.class})
 public class GrayLoadAutoConfigration {
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/java/cn/springcloud/service/a/ServiceAApplication.java b/spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/java/cn/springcloud/service/a/ServiceAApplication.java
@@ -1,6 +1,5 @@
 package cn.springcloud.service.a;
 
-import cn.springcloud.gray.client.EnableGrayClient;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -15,7 +14,6 @@
  */
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableGrayClient
 public class ServiceAApplication {
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(ServiceAApplication.class);
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/resources/config/application.yml b/spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/resources/config/application.yml
@@ -14,6 +14,7 @@ eureka:
     lease-renewal-interval-in-seconds: 10
     lease-expiration-duration-in-seconds: 30
 gray:
+  enabled: true
   client:
     instance:
       grayEnroll: false #是否在启动后自动注册成灰度实例
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/java/cn/springcloud/gray/service/b/ServiceBApplication.java b/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/java/cn/springcloud/gray/service/b/ServiceBApplication.java
@@ -1,6 +1,5 @@
 package cn.springcloud.gray.service.b;
 
-import cn.springcloud.gray.client.EnableGrayClient;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -16,7 +15,6 @@
  */
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableGrayClient
 @EnableFeignClients
 public class ServiceBApplication {
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(ServiceBApplication.class);
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/java/cn/springcloud/gray/service/b/configuration/RestTemplateConfiguration.java b/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/java/cn/springcloud/gray/service/b/configuration/RestTemplateConfiguration.java
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml b/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/java/cn/springcloud/gray/zuul/GrayZuulApplication.java b/spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/java/cn/springcloud/gray/zuul/GrayZuulApplication.java
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/resources/config/application.yml b/spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/resources/config/application.yml
diff --git a/spring-cloud-starter-gray-client/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-gray-client/src/main/resources/META-INF/spring.factories
