Commit 8fc4fc27 by Nepxion

框架内置的三个Http Header加前缀n-d-,避免和业务系统冲突,分别是"n-d-region", "n-d-version", "n-d-address"

parent 4954ef0a
...@@ -24,18 +24,21 @@ public class DiscoveryConstant { ...@@ -24,18 +24,21 @@ public class DiscoveryConstant {
public static final String SPRING_APPLICATION_NAME = "spring.application.name"; public static final String SPRING_APPLICATION_NAME = "spring.application.name";
public static final String GROUP = "group"; public static final String GROUP = "group";
public static final String REGION = "region";
public static final String ADDRESS = "address";
public static final String SERVICE_ID = "serviceId"; public static final String SERVICE_ID = "serviceId";
public static final String HOST = "host"; public static final String HOST = "host";
public static final String PORT = "port"; public static final String PORT = "port";
public static final String METADATA = "metadata"; public static final String METADATA = "metadata";
public static final String REGION = "region";
public static final String VERSION = "version"; public static final String VERSION = "version";
public static final String DYNAMIC_VERSION = "dynamicVersion"; public static final String DYNAMIC_VERSION = "dynamicVersion";
public static final String RULE = "rule"; public static final String RULE = "rule";
public static final String DYNAMIC_RULE = "dynamicRule"; public static final String DYNAMIC_RULE = "dynamicRule";
public static final String REACH_MAX_LIMITED_COUNT = "reach max limited count"; public static final String REACH_MAX_LIMITED_COUNT = "reach max limited count";
public static final String N_D_REGION = "n-d-region";
public static final String N_D_VERSION = "n-d-version";
public static final String N_D_ADDRESS = "n-d-address";
public static final String XML_FORMAT = "xml"; public static final String XML_FORMAT = "xml";
public static final String JSON_FORMAT = "json"; public static final String JSON_FORMAT = "json";
public static final String PREFIX_CLASSPATH = "classpath:"; public static final String PREFIX_CLASSPATH = "classpath:";
......
...@@ -36,7 +36,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -36,7 +36,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return exchange.getRequest().getHeaders().getFirst(DiscoveryConstant.VERSION); return exchange.getRequest().getHeaders().getFirst(DiscoveryConstant.N_D_VERSION);
} }
@Override @Override
...@@ -50,7 +50,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -50,7 +50,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return exchange.getRequest().getHeaders().getFirst(DiscoveryConstant.REGION); return exchange.getRequest().getHeaders().getFirst(DiscoveryConstant.N_D_REGION);
} }
@Override @Override
...@@ -64,6 +64,6 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -64,6 +64,6 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return exchange.getRequest().getHeaders().getFirst(DiscoveryConstant.ADDRESS); return exchange.getRequest().getHeaders().getFirst(DiscoveryConstant.N_D_ADDRESS);
} }
} }
\ No newline at end of file
...@@ -36,7 +36,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -36,7 +36,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return attributes.getRequest().getHeader(DiscoveryConstant.VERSION); return attributes.getRequest().getHeader(DiscoveryConstant.N_D_VERSION);
} }
@Override @Override
...@@ -50,7 +50,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -50,7 +50,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return attributes.getRequest().getHeader(DiscoveryConstant.REGION); return attributes.getRequest().getHeader(DiscoveryConstant.N_D_REGION);
} }
@Override @Override
...@@ -64,6 +64,6 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -64,6 +64,6 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return attributes.getRequest().getHeader(DiscoveryConstant.ADDRESS); return attributes.getRequest().getHeader(DiscoveryConstant.N_D_ADDRESS);
} }
} }
\ No newline at end of file
...@@ -47,14 +47,14 @@ public class FeignStrategyInterceptor implements RequestInterceptor { ...@@ -47,14 +47,14 @@ public class FeignStrategyInterceptor implements RequestInterceptor {
if (StringUtils.isNotEmpty(requestHeaders)) { if (StringUtils.isNotEmpty(requestHeaders)) {
requestHeaderList.addAll(StringUtil.splitToList(requestHeaders.toLowerCase(), DiscoveryConstant.SEPARATE)); requestHeaderList.addAll(StringUtil.splitToList(requestHeaders.toLowerCase(), DiscoveryConstant.SEPARATE));
} }
if (!requestHeaderList.contains(DiscoveryConstant.VERSION)) { if (!requestHeaderList.contains(DiscoveryConstant.N_D_VERSION)) {
requestHeaderList.add(DiscoveryConstant.VERSION); requestHeaderList.add(DiscoveryConstant.N_D_VERSION);
} }
if (!requestHeaderList.contains(DiscoveryConstant.REGION)) { if (!requestHeaderList.contains(DiscoveryConstant.N_D_REGION)) {
requestHeaderList.add(DiscoveryConstant.REGION); requestHeaderList.add(DiscoveryConstant.N_D_REGION);
} }
if (!requestHeaderList.contains(DiscoveryConstant.ADDRESS)) { if (!requestHeaderList.contains(DiscoveryConstant.N_D_ADDRESS)) {
requestHeaderList.add(DiscoveryConstant.ADDRESS); requestHeaderList.add(DiscoveryConstant.N_D_ADDRESS);
} }
LOG.info("Feign intercepted headers are {}", StringUtils.isNotEmpty(requestHeaders) ? requestHeaders : "empty"); LOG.info("Feign intercepted headers are {}", StringUtils.isNotEmpty(requestHeaders) ? requestHeaders : "empty");
LOG.info("-------------------------------------------------"); LOG.info("-------------------------------------------------");
......
...@@ -50,14 +50,14 @@ public class RestTemplateStrategyInterceptor implements ClientHttpRequestInterce ...@@ -50,14 +50,14 @@ public class RestTemplateStrategyInterceptor implements ClientHttpRequestInterce
if (StringUtils.isNotEmpty(requestHeaders)) { if (StringUtils.isNotEmpty(requestHeaders)) {
requestHeaderList.addAll(StringUtil.splitToList(requestHeaders.toLowerCase(), DiscoveryConstant.SEPARATE)); requestHeaderList.addAll(StringUtil.splitToList(requestHeaders.toLowerCase(), DiscoveryConstant.SEPARATE));
} }
if (!requestHeaderList.contains(DiscoveryConstant.VERSION)) { if (!requestHeaderList.contains(DiscoveryConstant.N_D_VERSION)) {
requestHeaderList.add(DiscoveryConstant.VERSION); requestHeaderList.add(DiscoveryConstant.N_D_VERSION);
} }
if (!requestHeaderList.contains(DiscoveryConstant.REGION)) { if (!requestHeaderList.contains(DiscoveryConstant.N_D_REGION)) {
requestHeaderList.add(DiscoveryConstant.REGION); requestHeaderList.add(DiscoveryConstant.N_D_REGION);
} }
if (!requestHeaderList.contains(DiscoveryConstant.ADDRESS)) { if (!requestHeaderList.contains(DiscoveryConstant.N_D_ADDRESS)) {
requestHeaderList.add(DiscoveryConstant.ADDRESS); requestHeaderList.add(DiscoveryConstant.N_D_ADDRESS);
} }
LOG.info("RestTemplate intercepted headers are {}", StringUtils.isNotEmpty(requestHeaders) ? requestHeaders : "empty"); LOG.info("RestTemplate intercepted headers are {}", StringUtils.isNotEmpty(requestHeaders) ? requestHeaders : "empty");
LOG.info("-------------------------------------------------"); LOG.info("-------------------------------------------------");
......
...@@ -37,7 +37,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -37,7 +37,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return request.getHeader(DiscoveryConstant.VERSION); return request.getHeader(DiscoveryConstant.N_D_VERSION);
} }
@Override @Override
...@@ -51,7 +51,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -51,7 +51,7 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return request.getHeader(DiscoveryConstant.REGION); return request.getHeader(DiscoveryConstant.N_D_REGION);
} }
@Override @Override
...@@ -65,6 +65,6 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap ...@@ -65,6 +65,6 @@ public class DefaultDiscoveryEnabledAdapter extends AbstractDiscoveryEnabledAdap
return null; return null;
} }
return request.getHeader(DiscoveryConstant.ADDRESS); return request.getHeader(DiscoveryConstant.N_D_ADDRESS);
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment