适配maven中央库的标准

Author: saleson

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

@@ -1,6 +1,6 @@
 package cn.springcloud.gray;
 
-
+import cn.springcloud.gray.client.config.properties.GrayLoadProperties;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayService;
@@ -16,46 +16,72 @@
 public class DefaultGrayManager extends AbstractCommunicableGrayManager {
 
     private Timer updateTimer = new Timer("Gray-Update-Timer", true);
+    private GrayLoadProperties grayLoadProperties;
 
-    public DefaultGrayManager(GrayClientConfig grayClientConfig, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
-                              List<RequestInterceptor> requestInterceptors) {
+    public DefaultGrayManager(
+            GrayClientConfig grayClientConfig,
+            GrayLoadProperties grayLoadProperties,
+            GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
+            List<RequestInterceptor> requestInterceptors) {
         super(grayClientConfig, grayDecisionFactoryKeeper, requestInterceptors);
+        this.grayLoadProperties = grayLoadProperties;
+
+
         openForWork();
     }
 
-
     public void openForWork() {
         log.info("拉取灰度列表");
         doUpdate();
-        updateTimer.schedule(new UpdateTask(),
-                getGrayClientConfig().getServiceUpdateIntervalTimerInMs(),
-                getGrayClientConfig().getServiceUpdateIntervalTimerInMs());
+        int timerMs = getGrayClientConfig().getServiceUpdateIntervalTimerInMs();
+        if (timerMs > 0) {
+            updateTimer.schedule(
+                    new UpdateTask(),
+                    getGrayClientConfig().getServiceUpdateIntervalTimerInMs(),
+                    getGrayClientConfig().getServiceUpdateIntervalTimerInMs());
+        }
     }
 
-
     private void doUpdate() {
         try {
             log.debug("更新灰度服务列表...");
-
             List<GrayInstance> grayInstances = getGrayInformationClient().allGrayInstances();
             Map<String, GrayService> grayServices = new ConcurrentHashMap<>();
-            grayInstances.forEach(instance -> {
-                updateGrayInstance(grayServices, instance);
-            });
+            grayInstances.forEach(
+                    instance -> {
+                        updateGrayInstance(grayServices, instance);
+                    });
+            joinLoadedGrays(grayServices);
             this.grayServices = grayServices;
         } catch (Exception e) {
             log.error("更新灰度服务列表失败", e);
         }
     }
 
 
+    /**
+     * 加入配置文件中的灰度实例，但不会覆盖列表中的信息
+     *
+     * @param grayServices 更新的灰度列表
+     */
+    private void joinLoadedGrays(Map<String, GrayService> grayServices) {
+        if (grayLoadProperties != null && grayLoadProperties.isEnabled()) {
+            grayLoadProperties.getGrayInstances().forEach(
+                    instance -> {
+                        if (grayServices.containsKey(instance.getServiceId())
+                                || grayServices.get(instance.getServiceId())
+                                .getGrayInstance(instance.getInstanceId()) != null) {
+                            updateGrayInstance(grayServices, instance);
+                        }
+                    });
+        }
+    }
+
     class UpdateTask extends TimerTask {
 
         @Override
         public void run() {
             doUpdate();
         }
     }
-
-
 }

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

@@ -34,7 +34,7 @@ public interface GrayClientConfig {
 
 
     /**
-     * 更新灰度列表的时间间隔(ms)
+     * 更新灰度列表的时间间隔(ms)，小于等于0将不会开启定时轮询
      *
      * @return 返回更新灰度列表的时间间隔(ms)
      */

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

@@ -3,6 +3,7 @@
 import cn.springcloud.gray.*;
 import cn.springcloud.gray.client.GrayClientInitializingDestroyBean;
 import cn.springcloud.gray.client.config.properties.GrayClientProperties;
+import cn.springcloud.gray.client.config.properties.GrayLoadProperties;
 import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
 import cn.springcloud.gray.request.RequestLocalStorage;
@@ -30,9 +31,9 @@ public class GrayClientAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    public GrayManager grayManager(GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
+    public GrayManager grayManager(GrayLoadProperties grayLoadProperties, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
                                    @Autowired(required = false) List<RequestInterceptor> requestInterceptors) {
-        return new DefaultGrayManager(grayClientProperties, grayDecisionFactoryKeeper, requestInterceptors);
+        return new DefaultGrayManager(grayClientProperties, grayLoadProperties, grayDecisionFactoryKeeper, requestInterceptors);
     }