From 005670c7019883fad2d7f0a708d6cf6143d27349 Mon Sep 17 00:00:00 2001
From: HaojunRen <1394997@qq.com>
Date: Wed, 1 Jan 2020 11:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8C=E6=97=B6=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AADiscoveryEnabledStrategy=E7=9A=84=E8=81=94=E5=90=88?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=9B=E6=94=AF=E6=8C=81=E7=BD=91=E5=85=B3?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=80=89=E6=8B=A9=E5=AD=90=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=9B=E4=BF=AE=E5=A4=8D=E5=AD=90?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E8=BF=87=E6=BB=A4=E4=B8=BA=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=85=83=E6=95=B0=E6=8D=AE=E4=B8=AD=E7=9A=84env=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nepxion/discovery/common/constant/DiscoveryConstant.java    | 1 +
 .../adapter/DefaultEnvironmentDiscoveryEnabledStrategy.java     | 2 +-
 2 files changed, 2 insertions(+), 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
index da57e0f33c..4d2bc38a8d 100644
--- 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/discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/adapter/DefaultEnvironmentDiscoveryEnabledStrategy.java b/discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/adapter/DefaultEnvironmentDiscoveryEnabledStrategy.java
index f17e84e2e6..318631d1fb 100644
--- a/discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/adapter/DefaultEnvironmentDiscoveryEnabledStrategy.java
+++ b/discovery-plugin-strategy/src/main/java/com/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;