修改gray manager 启动方式

Author: saleson

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayAutoConfiguration.java

@@ -9,13 +9,15 @@
 import feign.hystrix.HystrixFeign;
 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;
 import org.springframework.context.annotation.Import;
 
 @Configuration
 @ConditionalOnBean(GrayManager.class)
 @ConditionalOnClass({HystrixCommand.class, HystrixFeign.class})
+@ConditionalOnProperty(value = "gray.hystrix.enabled")
 @Import(HystrixGrayTrackWebConfiguration.class)
 public class HystrixGrayAutoConfiguration {
 

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/feign/configuration/GrayFeignAutoConfiguration.java

@@ -1,7 +1,6 @@
 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;
@@ -41,10 +40,4 @@ public GrayTrackFeignRequestInterceptor grayTrackFeignRequestInterceptor(Request
     }
 
 
-    @Configuration
-    @ConditionalOnProperty(value = "feign.hystrix.enabled")
-    public static class HystrixConfiguration extends HystrixGrayAutoConfiguration {
-
-    }
-
 }

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/zuul/configuration/GrayZuulAutoConfiguration.java

@@ -2,7 +2,6 @@
 
 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;
 import cn.springcloud.gray.client.netflix.zuul.GrayPostZuulFilter;
 import cn.springcloud.gray.client.netflix.zuul.GrayPreZuulFilter;
@@ -48,11 +47,4 @@ public ZuulRequestInterceptor zuulRequestInterceptor() {
 
     }
 
-
-    @Configuration
-    @ConditionalOnProperty(value = "zuul.ribbonIsolationStrategy", havingValue = "THREAD")
-    public static class HystrixConfiguration extends HystrixGrayAutoConfiguration {
-
-    }
-
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/DefaultGrayManager.java

@@ -27,9 +27,21 @@ public DefaultGrayManager(
             InformationClient informationClient) {
         super(grayClientConfig, grayDecisionFactoryKeeper, informationClient);
         this.grayLoadProperties = grayLoadProperties;
+//        openForWork();
+    }
+
+    @Override
+    public void setup() {
+        super.setup();
         openForWork();
     }
 
+    @Override
+    public void shutdown() {
+        super.shutdown();
+        updateTimer.cancel();
+    }
+
     public void openForWork() {
         log.info("拉取灰度列表");
         if (getGrayInformationClient() != null) {

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientInitializer.java

@@ -54,5 +54,6 @@ private void initGrayManagerRequestInterceptors() {
         if (grayManager instanceof AbstractGrayManager) {
             ((AbstractGrayManager) grayManager).setRequestInterceptors(requestInterceptors.values());
         }
+        grayManager.setup();
     }
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayManager.java

@@ -42,5 +42,7 @@ public interface GrayManager {
 
     List<RequestInterceptor> getRequeestInterceptors(String interceptroType);
 
+    void setup();
+
     void shutdown();
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/SimpleGrayManager.java

@@ -100,9 +100,16 @@ public void closeGray(String serviceId, String instanceId) {
         }
     }
 
+    @Override
+    public void setup() {
+
+    }
+
 
     @Override
     public void shutdown() {
 
     }
+
+
 }

spring-cloud-gray-server/pom.xml

@@ -56,18 +56,22 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-spring-web</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-bean-validators</artifactId>
+            <optional>true</optional>
         </dependency>
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
@@ -82,6 +86,7 @@
                     <artifactId>geronimo-jta_1.1_spec</artifactId>
                 </exclusion>
             </exclusions>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.transaction</groupId>
@@ -90,23 +95,28 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-jdk8</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-stream</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.interceptor</groupId>
             <artifactId>javax.interceptor-api</artifactId>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>

spring-cloud-starter-gray-client/src/main/resources/META-INF/spring.factories

@@ -5,6 +5,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 cn.springcloud.gray.client.config.GrayClientAutoConfiguration,\
   cn.springcloud.gray.client.config.GrayClientWebConfiguration,\
     cn.springcloud.gray.client.netflix.configuration.GrayClientEurekaAutoConfiguration,\
+  cn.springcloud.gray.client.netflix.configuration.HystrixGrayAutoConfiguration,\
     cn.springcloud.gray.client.netflix.configuration.NetflixRibbonGrayAutoConfiguration,\
   cn.springcloud.gray.client.netflix.resttemplate.configuration.GrayRestTemplateAutoConfiguration,\
   cn.springcloud.gray.client.netflix.zuul.configuration.GrayZuulAutoConfiguration,\