增加基于随机权重的平滑灰度发布功能

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/configuration/PluginLoadBalanceConfiguration.java

@@ -10,13 +10,15 @@ package com.nepxion.discovery.plugin.framework.configuration;
  */
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.netflix.ribbon.PropertiesFactory;
 import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClientName;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.nepxion.discovery.plugin.framework.decorator.ZoneAvoidanceRuleDecorator;
 import com.nepxion.discovery.plugin.framework.listener.loadbalance.LoadBalanceListenerExecutor;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.ILoadBalancer;
@@ -31,7 +33,7 @@ import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
 @Configuration
 @AutoConfigureAfter(RibbonClientConfiguration.class)
 public class PluginLoadBalanceConfiguration {
-    @Value("${ribbon.client.name}")
+    @RibbonClientName
     private String serviceId = "client";
 
     @Autowired
@@ -41,6 +43,19 @@ public class PluginLoadBalanceConfiguration {
     private LoadBalanceListenerExecutor loadBalanceListenerExecutor;
 
     @Bean
+    @ConditionalOnMissingBean
+    public IRule ribbonRule(IClientConfig config) {
+        if (this.propertiesFactory.isSet(IRule.class, serviceId)) {
+            return this.propertiesFactory.get(IRule.class, config, serviceId);
+        }
+
+        ZoneAvoidanceRuleDecorator rule = new ZoneAvoidanceRuleDecorator();
+        rule.initWithNiwsConfig(config);
+
+        return rule;
+    }
+
+    @Bean
     public ILoadBalancer ribbonLoadBalancer(IClientConfig config, ServerList<Server> serverList, ServerListFilter<Server> serverListFilter, IRule rule, IPing ping, ServerListUpdater serverListUpdater) {
         if (this.propertiesFactory.isSet(ILoadBalancer.class, serviceId)) {
             return this.propertiesFactory.get(ILoadBalancer.class, config, serviceId);