重构通过Rest方式实时版本路由功能

discovery-plugin-strategy-extension-gateway/src/main/java/com/nepxion/discovery/plugin/strategy/extension/gateway/configuration/GatewayStrategyAutoConfiguration.java

@@ -17,6 +17,7 @@ import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.strategy.constant.StrategyConstant;
 import com.nepxion.discovery.plugin.strategy.extension.gateway.filter.GatewayStrategyFilter;
+import com.nepxion.discovery.plugin.strategy.extension.gateway.impl.VersionDiscoveryEnabledAdapter;
 
 @Configuration
 @AutoConfigureBefore(RibbonClientConfiguration.class)
@@ -26,4 +27,9 @@ public class GatewayStrategyAutoConfiguration {
     public GatewayStrategyFilter gatewayStrategyFilter() {
         return new GatewayStrategyFilter();
     }
+
+    @Bean
+    public VersionDiscoveryEnabledAdapter discoveryEnabledAdapter() {
+        return new VersionDiscoveryEnabledAdapter();
+    }
 }
\ No newline at end of file

discovery-plugin-strategy-extension-gateway/src/main/java/com/nepxion/discovery/plugin/strategy/extension/gateway/impl/VersionDiscoveryEnabledAdapter.java

@@ -12,17 +12,31 @@ package com.nepxion.discovery.plugin.strategy.extension.gateway.impl;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.util.JsonUtil;
 import com.nepxion.discovery.plugin.strategy.discovery.DiscoveryEnabledAdapter;
+import com.nepxion.discovery.plugin.strategy.discovery.DiscoveryEnabledExtension;
 import com.nepxion.discovery.plugin.strategy.extension.gateway.context.GatewayStrategyContext;
 import com.netflix.loadbalancer.Server;
 
 public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
-    @SuppressWarnings("unchecked")
+    @Autowired(required = false)
+    private DiscoveryEnabledExtension discoveryEnabledExtension;
+
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {
+        boolean enabled = applyVersion(server, metadata);
+        if (!enabled) {
+            return false;
+        }
+
+        return applyExtension(server, metadata);
+    }
+
+    @SuppressWarnings("unchecked")
+    private boolean applyVersion(Server server, Map<String, String> metadata) {
         GatewayStrategyContext context = GatewayStrategyContext.getCurrentContext();
         String versionJson = context.getExchange().getRequest().getHeaders().getFirst(DiscoveryConstant.VERSION);
         if (StringUtils.isEmpty(versionJson)) {
@@ -47,4 +61,12 @@ public class VersionDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
 
         return false;
     }
+
+    private boolean applyExtension(Server server, Map<String, String> metadata) {
+        if (discoveryEnabledExtension == null) {
+            return true;
+        }
+
+        return discoveryEnabledExtension.apply(server, metadata);
+    }
 }
\ No newline at end of file

discovery-springcloud-example-gateway/src/main/java/com/nepxion/discovery/plugin/example/gateway/DiscoveryApplicationGateway.java

@@ -14,7 +14,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Bean;
 
-import com.nepxion.discovery.plugin.example.gateway.extension.MyDiscoveryEnabledAdapter;
+import com.nepxion.discovery.plugin.example.gateway.extension.MyDiscoveryEnabledExtension;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -24,8 +24,8 @@ public class DiscoveryApplicationGateway {
     }
 
     @Bean
-    public MyDiscoveryEnabledAdapter myDiscoveryEnabledAdapter() {
-        return new MyDiscoveryEnabledAdapter();
+    public MyDiscoveryEnabledExtension myDiscoveryEnabledExtension() {
+        return new MyDiscoveryEnabledExtension();
     }
 
     /*@Bean

discovery-springcloud-example-gateway/src/main/java/com/nepxion/discovery/plugin/example/gateway/extension/MyDiscoveryEnabledAdapter.java → discovery-springcloud-example-gateway/src/main/java/com/nepxion/discovery/plugin/example/gateway/extension/MyDiscoveryEnabledExtension.java

@@ -15,24 +15,17 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.nepxion.discovery.plugin.strategy.discovery.DiscoveryEnabledExtension;
 import com.nepxion.discovery.plugin.strategy.extension.gateway.context.GatewayStrategyContext;
-import com.nepxion.discovery.plugin.strategy.extension.gateway.impl.VersionDiscoveryEnabledAdapter;
 import com.netflix.loadbalancer.Server;
 
 // 实现了组合策略，版本路由策略+自定义策略
-// 如果不想要版本路由策略，请直接implements DiscoveryEnabledAdapter，实现自定义策略 
-public class MyDiscoveryEnabledAdapter extends VersionDiscoveryEnabledAdapter {
-    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledAdapter.class);
+public class MyDiscoveryEnabledExtension implements DiscoveryEnabledExtension {
+    private static final Logger LOG = LoggerFactory.getLogger(MyDiscoveryEnabledExtension.class);
 
     @Override
     public boolean apply(Server server, Map<String, String> metadata) {
-        // 1.对Rest调用传来的Header的路由Version做策略。注意这个Version不是灰度发布的Version
-        boolean enabled = super.apply(server, metadata);
-        if (!enabled) {
-            return false;
-        }
-
-        // 2.对Rest调用传来的Header参数（例如Token）做策略
+        // 对Rest调用传来的Header参数（例如Token）做策略
         return applyFromHeader(server, metadata);
     }