Merge pull request #45 from SpringCloud/A

A

Author: saleson

README.md

@@ -2,8 +2,8 @@
 
 
 [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![Release](https://img.shields.io/badge/release-A.1.1.0-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/A.1.1.0)
-[![Release](https://img.shields.io/badge/release-B.0.0.1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/B.0.0.1)
+[![A Release](https://img.shields.io/badge/release-A.1.1.1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/A.1.1.1)
+[![B Release](https://img.shields.io/badge/release-B.0.0.1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/B.0.0.1)
 
 ## 介绍
 Spring Cloud Gray 是一套开源的微服务灰度路由解决方案，它由spring-cloud-gray-client，spring-cloud-gray-client-netflix 和 spring-cloud-tray-server，spring-cloud-gray-webui组成。<br/>
@@ -29,11 +29,11 @@ insert into `user` ( `user_id`, `account`, `name`, `password`, `roles`, `status`
 [管控端界面使用手册](doc/guide/gray-admin-guide.md)
 
 ## 版本信息
-项目版本 | srpingcloud版本 | springboot版本
+项目分支 | srpingcloud版本 | springboot版本
 --- | --- | ---
-A.1.1.0 | Edgware.SR6 | 1.5.22.RELEASE
-B.0.0.1 | Finchley.SR4 | 2.0.9.RELEASE
-C.0.0.1-SNAPHOST | Greenwich.SR2 | 2.1.7.RELEASE
+A | Edgware | 1.5.*
+B | Finchley | 2.0.*
+C | Greenwich | 2.1.*
 
 
 ## Spring Cloud Gray 能做什么
@@ -171,9 +171,11 @@ spring-cloud-gray-plugin-feign | 灰度客户端与openFiegn集成的插件
 spring-cloud-gray-plugin-zuul | 灰度客户端与zuul 1.0集成的插件
 spring-cloud-gray-plugin-gateway | 灰度客户端与spring cloud gateway集成的插件(B版及以上)
 spring-cloud-gray-plugin-event-stream | 灰度客户端与spring cloud stream(rabbitmq)集成的插件
+spring-cloud-gray-plugin-ribbon-nacos-discovery | 灰度客户端支持ribbon与注册中心nacos集成的插件
 spring-cloud-gray-server | 灰度管控端的核心代码
 spring-cloud-gray-server-plugin-eureka | 灰度管控端与注册中心eureka集成的插件
 spring-cloud-gray-server-plugin-event-stream | 灰度管控端与spring cloud stream(rabbitmq)集成的插件
+spring-cloud-gray-server-plugin-nacos-discovery | 灰度管控端与注册中心nacos集成的插件
 spring-cloud-starter-gray-client | 灰度客户端starter
 spring-cloud-starter-gray-server | 灰度管控端starter
 spring-cloud-starter-gray-eureka-server | eureka server的灰度插件

doc/img/gray-all.png

@@ -12,7 +12,7 @@
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray</artifactId>
     <packaging>pom</packaging>
-    <version>A.1.1.1-SNAPSHOT</version>
+    <version>A.1.1.1</version>
     <url>https://github.com/SpringCloud/spring-cloud-gray</url>
     <organization>
         <name>Spring Cloud中国社区</name>
@@ -62,6 +62,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <java.version>1.8</java.version>
         <spring-cloud.version>Edgware.SR6</spring-cloud.version>
+        <alibaba-cloud.version>1.5.0.RELEASE</alibaba-cloud.version>
         <springfox.version>2.9.2</springfox.version>
         <lombok.version>1.18.8</lombok.version>
         <slf4j.version>1.7.26</slf4j.version>
@@ -99,6 +100,17 @@
                 <version>${caffeine.version}</version>
             </dependency>
 
+
+            <!-- alibaba cloud start -->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+                <version>${alibaba-cloud.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <!-- alibaba cloud end -->
+
+
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger2</artifactId>
@@ -169,6 +181,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>cn.springcloud.gray</groupId>
+                <artifactId>spring-cloud-gray-plugin-ribbon-nacos-discovery</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>cn.springcloud.gray</groupId>
                 <artifactId>spring-cloud-gray-plugin-feign</artifactId>
@@ -204,6 +222,11 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>cn.springcloud.gray</groupId>
+                <artifactId>spring-cloud-gray-server-plugin-nacos-discovery</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- gray server plugins end -->
 
 

doc/img/gray-release.png

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.1.1-SNAPSHOT</version>
+        <version>A.1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -4,6 +4,7 @@
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.choose.GrayPredicate;
 import cn.springcloud.gray.client.netflix.RibbonServerChooser;
+import cn.springcloud.gray.client.netflix.ribbon.RibbonServerExplainer;
 import cn.springcloud.gray.routing.connectionpoint.DefaultRoutingConnectionPoint;
 import cn.springcloud.gray.routing.connectionpoint.RoutingConnectionPoint;
 import cn.springcloud.gray.client.netflix.ribbon.configuration.GrayRibbonClientsConfiguration;
@@ -16,6 +17,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -47,4 +49,11 @@ public RibbonServerChooser ribbonServerChooser(
                 grayPredicate, serverExplainer, serverListProcess);
     }
 
+
+    @Bean
+    @ConditionalOnMissingBean
+    public ServerExplainer<Server> ribbonServerExplainer(SpringClientFactory springClientFactory){
+        return new RibbonServerExplainer(springClientFactory);
+    }
+
 }

spring-cloud-gray-client-netflix/pom.xml

@@ -0,0 +1,50 @@
+package cn.springcloud.gray.client.netflix.ribbon;
+
+import cn.springcloud.gray.servernode.ServerExplainer;
+import cn.springcloud.gray.servernode.ServerSpec;
+import com.netflix.loadbalancer.Server;
+import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+import java.util.Map;
+
+public class RibbonServerExplainer implements ServerExplainer<Server> {
+
+    private SpringClientFactory springClientFactory;
+
+    public RibbonServerExplainer(SpringClientFactory springClientFactory) {
+        this.springClientFactory = springClientFactory;
+    }
+
+    @Override
+    public ServerSpec apply(Server server) {
+        Map metadata = getServerMetadata(server.getMetaInfo().getServiceIdForDiscovery(), server);
+        return ServerSpec.builder().instanceId(server.getMetaInfo().getInstanceId())
+                .serviceId(server.getMetaInfo().getServiceIdForDiscovery())
+                .metadatas(metadata).build();
+    }
+
+    public ServerIntrospector serverIntrospector(String serviceId) {
+        if (springClientFactory == null) {
+            return new DefaultServerIntrospector();
+        }
+        ServerIntrospector serverIntrospector = this.springClientFactory.getInstance(serviceId,
+                ServerIntrospector.class);
+        if (serverIntrospector == null) {
+            serverIntrospector = new DefaultServerIntrospector();
+        }
+        return serverIntrospector;
+    }
+
+    /**
+     * 获取实例的metadata信息
+     *
+     * @param serviceId 服务id
+     * @param server    ribbon服务器(服务实例)
+     * @return 服务实例的metadata信息
+     */
+    public Map<String, String> getServerMetadata(String serviceId, Server server) {
+        return serverIntrospector(serviceId).getMetadata(server);
+    }
+}

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.1.1-SNAPSHOT</version>
+        <version>A.1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/RibbonServerExplainer.java

@@ -0,0 +1,30 @@
+package cn.springcloud.gray.client.config;
+
+import cn.springcloud.gray.local.DefaultInstanceLocalInfoInitiralizer;
+import cn.springcloud.gray.local.InstanceLocalInfoInitiralizer;
+import cn.springcloud.gray.servernode.DefaultInstanceDiscoveryClient;
+import cn.springcloud.gray.servernode.InstanceDiscoveryClient;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnProperty(value = "gray.enabled")
+public class GrayClientDiscoveryAutoConfiguration {
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public InstanceDiscoveryClient instanceDiscoveryClient(){
+        return new DefaultInstanceDiscoveryClient();
+    }
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public InstanceLocalInfoInitiralizer instanceLocalInfoInitiralizer(){
+        return new DefaultInstanceLocalInfoInitiralizer();
+    }
+
+}

spring-cloud-gray-client/pom.xml

@@ -0,0 +1,10 @@
+package cn.springcloud.gray.local;
+
+
+public class DefaultInstanceLocalInfoInitiralizer extends LazyInstanceLocalInfoInitiralizer {
+
+    @Override
+    protected String getLocalInstanceId() {
+        return "";
+    }
+}