metadata里zone是保留关键字，故改为region

discovery-common/src/main/java/com/nepxion/discovery/common/constant/DiscoveryConstant.java

@@ -21,6 +21,7 @@ public class DiscoveryConstant {
 
     public static final String SPRING_APPLICATION_NAME = "spring.application.name";
     public static final String GROUP = "group";
+    public static final String REGION = "region";
     public static final String ZONE = "zone";
     public static final String SERVICE_ID = "serviceId";
     public static final String HOST = "host";

discovery-plugin-strategy-extension-gateway/src/main/java/com/nepxion/discovery/plugin/strategy/extension/gateway/adapter/DefaultDiscoveryEnabledAdapter.java

@@ -22,9 +22,9 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
     }
 
     @Override
-    protected String getZoneValue() {
+    protected String getRegionValue() {
         GatewayStrategyContext context = GatewayStrategyContext.getCurrentContext();
 
-        return context.getExchange().getRequest().getHeaders().getFirst(DiscoveryConstant.ZONE);
+        return context.getExchange().getRequest().getHeaders().getFirst(DiscoveryConstant.REGION);
     }
 }
\ No newline at end of file

discovery-plugin-strategy-extension-service/src/main/java/com/nepxion/discovery/plugin/strategy/extension/service/adapter/DefaultDiscoveryEnabledAdapter.java

@@ -27,12 +27,12 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
     }
 
     @Override
-    protected String getZoneValue() {
+    protected String getRegionValue() {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if (attributes == null) {
             return null;
         }
 
-        return attributes.getRequest().getHeader(DiscoveryConstant.ZONE);
+        return attributes.getRequest().getHeader(DiscoveryConstant.REGION);
     }
 }
\ No newline at end of file

discovery-plugin-strategy-extension-zuul/src/main/java/com/nepxion/discovery/plugin/strategy/extension/zuul/adapter/DefaultDiscoveryEnabledAdapter.java

@@ -22,9 +22,9 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
     }
 
     @Override
-    protected String getZoneValue() {
+    protected String getRegionValue() {
         RequestContext context = RequestContext.getCurrentContext();
 
-        return context.getRequest().getHeader(DiscoveryConstant.ZONE);
+        return context.getRequest().getHeader(DiscoveryConstant.REGION);
     }
 }
\ No newline at end of file

discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/adapter/AbstractDiscoveryEnabledAdapter.java

@@ -29,7 +29,7 @@ public abstract class AbstractDiscoveryEnabledAdapter implements DiscoveryEnable
             return false;
         }
 
-        enabled = applyZone(server, metadata);
+        enabled = applyRegion(server, metadata);
         if (!enabled) {
             return false;
         }
@@ -63,18 +63,18 @@ public abstract class AbstractDiscoveryEnabledAdapter implements DiscoveryEnable
         return false;
     }
 
-    private boolean applyZone(Server server, Map<String, String> metadata) {
-        String zoneValue = getZoneValue();
-        if (StringUtils.isEmpty(zoneValue)) {
+    private boolean applyRegion(Server server, Map<String, String> metadata) {
+        String regionValue = getRegionValue();
+        if (StringUtils.isEmpty(regionValue)) {
             return true;
         }
 
-        String zone = metadata.get(DiscoveryConstant.ZONE);
-        if (StringUtils.isEmpty(zone)) {
+        String region = metadata.get(DiscoveryConstant.REGION);
+        if (StringUtils.isEmpty(region)) {
             return false;
         }
 
-        if (StringUtils.equals(zoneValue, zone)) {
+        if (StringUtils.equals(regionValue, region)) {
             return true;
         }
 
@@ -91,5 +91,5 @@ public abstract class AbstractDiscoveryEnabledAdapter implements DiscoveryEnable
 
     protected abstract String getVersionValue();
 
-    protected abstract String getZoneValue();
+    protected abstract String getRegionValue();
 }
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-a1.properties

@@ -5,15 +5,15 @@ server.port=1100
 # Eureka config
 eureka.instance.metadataMap.version=1.0
 eureka.instance.metadataMap.group=example-service-group
-eureka.instance.metadataMap.zone=dev
+eureka.instance.metadataMap.region=dev
 
 # Consul config（多个值用“,”分隔，例如version=1.0,value=abc）
-spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group,zone=dev
+spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group,region=dev
 
 # Zookeeper config
 spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
-spring.cloud.zookeeper.discovery.metadata.zone=dev
+spring.cloud.zookeeper.discovery.metadata.region=dev
 
 # Admin config
 management.server.port=5100
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-a2.properties

@@ -5,15 +5,15 @@ server.port=1101
 # Eureka config
 eureka.instance.metadataMap.version=1.1
 eureka.instance.metadataMap.group=example-service-group
-eureka.instance.metadataMap.zone=qa
+eureka.instance.metadataMap.region=qa
 
 # Consul config
-spring.cloud.consul.discovery.tags=version=1.1,group=example-service-group,zone=qa
+spring.cloud.consul.discovery.tags=version=1.1,group=example-service-group,region=qa
 
 # Zookeeper config
 spring.cloud.zookeeper.discovery.metadata.version=1.1
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
-spring.cloud.zookeeper.discovery.metadata.zone=qa
+spring.cloud.zookeeper.discovery.metadata.region=qa
 
 # Admin config
 management.server.port=5101
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-b1.properties

@@ -5,15 +5,15 @@ server.port=1200
 # Eureka config
 eureka.instance.metadataMap.version=1.0
 eureka.instance.metadataMap.group=example-service-group
-eureka.instance.metadataMap.zone=dev
+eureka.instance.metadataMap.region=dev
 
 # Consul config
-spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group,zone=dev
+spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group,region=dev
 
 # Zookeeper config
 spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
-spring.cloud.zookeeper.discovery.metadata.zone=dev
+spring.cloud.zookeeper.discovery.metadata.region=dev
 
 # Admin config
 management.server.port=5200
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-b2.properties

@@ -5,15 +5,15 @@ server.port=1201
 # Eureka config
 eureka.instance.metadataMap.version=1.1
 eureka.instance.metadataMap.group=example-service-group
-eureka.instance.metadataMap.zone=qa
+eureka.instance.metadataMap.region=qa
 
 # Consul config
-spring.cloud.consul.discovery.tags=version=1.1,group=example-service-group,zone=qa
+spring.cloud.consul.discovery.tags=version=1.1,group=example-service-group,region=qa
 
 # Zookeeper config
 spring.cloud.zookeeper.discovery.metadata.version=1.1
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
-spring.cloud.zookeeper.discovery.metadata.zone=qa
+spring.cloud.zookeeper.discovery.metadata.region=qa
 
 # Admin config
 management.server.port=5201
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-c1.properties

@@ -5,15 +5,15 @@ server.port=1300
 # Eureka config
 eureka.instance.metadataMap.version=1.0
 eureka.instance.metadataMap.group=example-service-group
-eureka.instance.metadataMap.zone=dev
+eureka.instance.metadataMap.region=dev
 
 # Consul config
-spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group,zone=dev
+spring.cloud.consul.discovery.tags=version=1.0,group=example-service-group,region=dev
 
 # Zookeeper config
 spring.cloud.zookeeper.discovery.metadata.version=1.0
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
-spring.cloud.zookeeper.discovery.metadata.zone=dev
+spring.cloud.zookeeper.discovery.metadata.region=dev
 
 # Admin config
 management.server.port=5300
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-c2.properties

@@ -5,15 +5,15 @@ server.port=1301
 # Eureka config
 eureka.instance.metadataMap.version=1.1
 eureka.instance.metadataMap.group=example-service-group
-eureka.instance.metadataMap.zone=qa
+eureka.instance.metadataMap.region=qa
 
 # Consul config
-spring.cloud.consul.discovery.tags=version=1.1,group=example-service-group,zone=qa
+spring.cloud.consul.discovery.tags=version=1.1,group=example-service-group,region=qa
 
 # Zookeeper config
 spring.cloud.zookeeper.discovery.metadata.version=1.1
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
-spring.cloud.zookeeper.discovery.metadata.zone=qa
+spring.cloud.zookeeper.discovery.metadata.region=qa
 
 # Admin config
 management.server.port=5301
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/application-c3.properties

@@ -5,15 +5,15 @@ server.port=1302
 # Eureka config
 eureka.instance.metadataMap.version=1.2
 eureka.instance.metadataMap.group=example-service-group
-eureka.instance.metadataMap.zone=qa
+eureka.instance.metadataMap.region=qa
 
 # Consul config
-spring.cloud.consul.discovery.tags=version=1.2,group=example-service-group,zone=qa
+spring.cloud.consul.discovery.tags=version=1.2,group=example-service-group,region=qa
 
 # Zookeeper config
 spring.cloud.zookeeper.discovery.metadata.version=1.2
 spring.cloud.zookeeper.discovery.metadata.group=example-service-group
-spring.cloud.zookeeper.discovery.metadata.zone=qa
+spring.cloud.zookeeper.discovery.metadata.region=qa
 
 # Admin config
 management.server.port=5302
\ No newline at end of file

discovery-springcloud-example-service/src/main/resources/bootstrap.properties

@@ -70,4 +70,4 @@ spring.boot.admin.url=http://localhost:5555
 # 用户自定义和编程灰度路由策略的时候，需要指定对业务Controller类的扫描路径，以便传递上下文对象。该项配置只对服务有效，对网关无效。缺失则默认关闭该功能
 spring.application.strategy.scan.packages=com.nepxion.discovery.plugin.example.service.feign
 # 用户自定义和编程灰度路由策略的时候，如果采用Feign进行Rest调用，需要把来自网关的某些Header参数传递到服务里，如果多个用“;”分隔，不允许出现空格。该项配置只对服务有效，对网关无效。缺失则默认关闭该功能
-spring.application.strategy.feign.headers=version;zone;token
+spring.application.strategy.feign.headers=version;region;token
\ No newline at end of file