实现nacos插件

优化starter-gray-server spring.factories

Author: saleson

pom.xml

@@ -169,6 +169,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>w1`
+
             <dependency>
                 <groupId>cn.springcloud.gray</groupId>
                 <artifactId>spring-cloud-gray-plugin-feign</artifactId>
@@ -204,6 +210,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 -->
 
 

spring-cloud-gray-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/src/main/java/cn/springcloud/gray/client/plugin/ribbon/nacos/NacosServerExplainer.java

@@ -0,0 +1,56 @@
+package cn.springcloud.gray.client.plugin.ribbon.nacos;
+
+import cn.springcloud.gray.servernode.ServerExplainer;
+import cn.springcloud.gray.servernode.ServerSpec;
+import com.netflix.loadbalancer.Server;
+import org.apache.commons.lang3.StringUtils;
+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 NacosServerExplainer implements ServerExplainer<Server> {
+
+    private SpringClientFactory springClientFactory;
+
+    public NacosServerExplainer(SpringClientFactory springClientFactory) {
+        this.springClientFactory = springClientFactory;
+    }
+
+    @Override
+    public ServerSpec apply(Server server) {
+        String appName = server.getMetaInfo().getAppName();
+        String seviceId = appName;
+        if(StringUtils.contains(appName, "@@")){
+            seviceId = StringUtils.split(appName, "@@")[1];
+        }
+        Map metadata = getServerMetadata(seviceId, server);
+        return ServerSpec.builder().instanceId(server.getMetaInfo().getInstanceId())
+                .serviceId(seviceId)
+                .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-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/src/main/java/cn/springcloud/gray/client/plugin/ribbon/nacos/configuration/GrayClientRibbonNacosAutoConfiguration.java

@@ -1,14 +1,17 @@
 package cn.springcloud.gray.client.plugin.ribbon.nacos.configuration;
 
 import cn.springcloud.gray.client.config.properties.GrayHoldoutServerProperties;
+import cn.springcloud.gray.client.plugin.ribbon.nacos.NacosServerExplainer;
 import cn.springcloud.gray.client.plugin.ribbon.nacos.NacosServerListProcessor;
+import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.servernode.ServerListProcessor;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
 import com.alibaba.cloud.nacos.ribbon.NacosServerList;
-import com.alibaba.nacos.api.naming.NamingService;
 import com.netflix.loadbalancer.Server;
 import com.netflix.ribbon.Ribbon;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -20,8 +23,14 @@ public class GrayClientRibbonNacosAutoConfiguration {
 
     @Bean
     public ServerListProcessor<Server> serverListProcessor(
-            GrayHoldoutServerProperties grayHoldoutServerProperties, NamingService namingService){
-        return new NacosServerListProcessor(grayHoldoutServerProperties, namingService);
+            GrayHoldoutServerProperties grayHoldoutServerProperties, NacosDiscoveryProperties discoveryProperties){
+        return new NacosServerListProcessor(grayHoldoutServerProperties, discoveryProperties.namingServiceInstance());
+    }
+
+
+    @Bean
+    public ServerExplainer<Server> serverExplainer(SpringClientFactory springClientFactory){
+        return new NacosServerExplainer(springClientFactory);
     }
 
 }

spring-cloud-starter-gray-server/src/main/resources/META-INF/spring.factories

@@ -3,6 +3,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   cn.springcloud.gray.server.configuration.GrayServerAutoConfiguration,\
   cn.springcloud.gray.server.configuration.DBStorageConfiguration,\
   cn.springcloud.gray.server.configuration.OperateAuditConfiguration,\
-  cn.springcloud.gray.server.netflix.eureka.configuration.GrayServiceEurekaAutoConfiguration,\
   cn.springcloud.gray.server.configuration.GrayServerEventAutoConfiguration,\
   cn.springcloud.gray.server.configuration.OAuth2Config