支持同时多个DiscoveryEnabledStrategy的联合判断；支持网关动态选择子环境的功能；修复子环境过滤为判断元数据中的env…

…为空的Bug
Alleninggx · Jan 1, 2020 · 005670c · 005670c
1 parent ad0f254
commit 005670c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/discovery-common/src/main/java/com/nepxion/discovery/common/constant/DiscoveryConstant.java b/discovery-common/src/main/java/com/nepxion/discovery/common/constant/DiscoveryConstant.java
@@ -88,6 +88,7 @@ public class DiscoveryConstant {
 
     public static final String N_D_VERSION = "n-d-version";
     public static final String N_D_REGION = "n-d-region";
+    public static final String N_D_ENVIRONMENT = "n-d-env";
     public static final String N_D_ADDRESS = "n-d-address";
     public static final String N_D_VERSION_WEIGHT = "n-d-version-weight";
     public static final String N_D_REGION_WEIGHT = "n-d-region-weight";

diff --git a/...nepxion/discovery/plugin/strategy/adapter/DefaultEnvironmentDiscoveryEnabledStrategy.java b/...nepxion/discovery/plugin/strategy/adapter/DefaultEnvironmentDiscoveryEnabledStrategy.java
@@ -23,7 +23,7 @@ public boolean apply(Server server) {
             return true;
         }
 
-        String headerEnvironment = strategyContextHolder.getHeader(DiscoveryConstant.ENVIRONMENT);
+        String headerEnvironment = strategyContextHolder.getHeader(DiscoveryConstant.N_D_ENVIRONMENT);
         // 传入headerEnvironment为空，返回true
         if (StringUtils.isEmpty(headerEnvironment)) {
             return true;