调整合并代码

Author: saleson

pom.xml

@@ -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>

spring-cloud-gray-plugins/pom.xml

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

spring-cloud-gray-plugins/spring-cloud-gray-plugin-eureka/src/main/java/cn/springcloud/gray/client/netflix/eureka/configuration/GrayClientEurekaAutoConfiguration.java

@@ -3,10 +3,11 @@
 import cn.springcloud.gray.client.config.properties.GrayHoldoutServerProperties;
 import cn.springcloud.gray.client.netflix.eureka.*;
 import cn.springcloud.gray.servernode.InstanceDiscoveryClient;
+import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.servernode.ServerListProcessor;
 import com.netflix.discovery.EurekaClient;
+import com.netflix.loadbalancer.Server;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -15,7 +16,6 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-//@ConditionalOnBean({GrayManager.class})
 @ConditionalOnProperty(value = "gray.enabled")
 @ConditionalOnClass({EurekaClient.class})
 public class GrayClientEurekaAutoConfiguration {

spring-cloud-gray-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/pom.xml

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

spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-nacos-discovery/pom.xml

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