优化代码

修复bug

Author: saleson

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

@@ -27,7 +27,7 @@
 public class GrayTrackConfiguration {
 
 
-    @Bean(initMethod = "openForWork")
+    @Bean(initMethod = "setup")
     @ConditionalOnMissingBean
     public GrayTrackHolder grayTrackHolder(
             GrayTrackProperties grayTrackProperties,

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayTrackProperties.java

@@ -18,6 +18,10 @@ public class GrayTrackProperties {
     private Web web = new Web();
 
     private int definitionsUpdateIntervalTimerInMs = 60000;
+    /**
+     * 实始追踪信息的延迟时间
+     */
+    private int definitionsInitializeDelayTimeInMs = 40000;
 
     @Setter
     @Getter

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

@@ -2,13 +2,11 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
+import org.apache.commons.collections.MapUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 @Getter
@@ -22,6 +20,9 @@ public class GrayHttpRequest extends GrayRequest {
 
 
     public void addHeaders(Map<String, ? extends Collection<String>> headers) {
+        if (MapUtils.isEmpty(headers)) {
+            return;
+        }
         headers.forEach((k, v) -> {
             Map<String, Collection<String>> headerMap = (Map<String, Collection<String>>) this.headers;
             headerMap.put(k, v);
@@ -30,6 +31,9 @@ public void addHeaders(Map<String, ? extends Collection<String>> headers) {
 
 
     public void addParameters(Map<String, ? extends Collection<String>> parameters) {
+        if (CollectionUtils.isEmpty(parameters)) {
+            return;
+        }
         parameters.forEach((k, v) -> {
             Map<String, Collection<String>> parameterMap = (Map<String, Collection<String>>) this.parameters;
             parameterMap.put(k, v);

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/DefaultGrayTrackHolder.java

@@ -38,6 +38,15 @@ public DefaultGrayTrackHolder(
 //        openForWork();
     }
 
+    public void setup() {
+        updateTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                openForWork();
+            }
+        }, grayTrackProperties.getDefinitionsInitializeDelayTimeInMs());
+    }
+
 
     public void openForWork() {
         log.info("拉取灰度追踪列表");

spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/pom.xml

@@ -45,10 +45,10 @@
             <artifactId>spring-cloud-starter-gray-client</artifactId>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.cloud</groupId>-->
-        <!--            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>-->
-        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml

@@ -1,31 +1,31 @@
 spring:
   application:
     name: service-b
-#  rabbitmq:
-#    addresses: 127.0.0.1:5672
-#    username: admin
-#    password: admin
-#  cloud:
-#    stream:
-#      bindings:
-#        GrayEventInput:
-#          group: service-a
-#          destination: gray_event
-#          consumer:
-#            concurrency: 1 #并发数
-#        #            max-attempts: 1
-#      #        GrayEventOutput:
-#      #          destination: gray-event
-#      rabbit:
-#        bindings:
-#          GrayEventInput:
-#            consumer:
-#              maxConcurrency: 1 #并发数
-#              #              prefetch: 1 #从mq一次获取消息的数量
-#              #              requeueRejected: true #spring cloud stream 如果出现异常， 是否需要重新投递消息， false表示丢弃。  也有相应的Exception， true-MessageRejectedWhileStoppingException false-AmqpRejectAndDontRequeueException
-#              #              auto-bind-dlq: true
-#              acknowledgeMode: AUTO
-##              acknowledgeMode: MANUAL
+  rabbitmq:
+    addresses: 127.0.0.1:5672
+    username: admin
+    password: admin
+  cloud:
+    stream:
+      bindings:
+        GrayEventInput:
+          group: service-a
+          destination: gray_event
+          consumer:
+            concurrency: 1 #并发数
+        #            max-attempts: 1
+      #        GrayEventOutput:
+      #          destination: gray-event
+      rabbit:
+        bindings:
+          GrayEventInput:
+            consumer:
+              maxConcurrency: 1 #并发数
+              #              prefetch: 1 #从mq一次获取消息的数量
+              #              requeueRejected: true #spring cloud stream 如果出现异常， 是否需要重新投递消息， false表示丢弃。  也有相应的Exception， true-MessageRejectedWhileStoppingException false-AmqpRejectAndDontRequeueException
+              #              auto-bind-dlq: true
+              acknowledgeMode: AUTO
+#              acknowledgeMode: MANUAL
 server:
   port: 20102
 eureka:
@@ -49,17 +49,17 @@ hystrix:
 
 
 gray:
-  enabled: false
+  enabled: true
   hystrix:
     enabled: true
   server:
-    #    url: http://localhost:20202
+    url: http://localhost:20202
     loadbalanced: false
     retryable: true
     retryNumberOfRetries: 3
   client:
     runenv: web
-    serviceUpdateIntervalTimerInMs: 0
+    serviceUpdateIntervalTimerInMs: 30000
     instance:
       grayEnroll: false
       grayEnrollDealyTimeInMs: 40000