diff --git a/README.md b/README.md index 1f45cff6e9..5005a7aac3 100644 --- a/README.md +++ b/README.md @@ -1211,7 +1211,7 @@ spring.application.strategy.service.sentinel.request.origin.key=n-d-service-id # 环境路由：环境隔离下，调用端实例找不到符合条件的提供端实例，把流量路由到一个通用或者备份环境，例如：元数据Metadata环境配置值为common（该值可配置，但不允许为保留值default） spring.application.environment.isolation.enabled=true # 流量路由到指定的环境下。不允许为保留值default，缺失则默认为common -spring.application.environment.transfer=common +spring.application.environment.route=common # 开启和关闭使用服务名前缀来作为服务组名。缺失则默认为false spring.application.group.generator.enabled=true @@ -1293,7 +1293,7 @@ spring.application.strategy.hystrix.threadlocal.supported=true # 环境路由：环境隔离下，调用端实例找不到符合条件的提供端实例，把流量路由到一个通用或者备份环境，例如：元数据Metadata环境配置值为common（该值可配置，但不允许为保留值default） spring.application.environment.isolation.enabled=true # 流量路由到指定的环境下。不允许为保留值default，缺失则默认为common -spring.application.environment.transfer=common +spring.application.environment.route=common # 开启和关闭使用服务名前缀来作为服务组名。缺失则默认为false spring.application.group.generator.enabled=true @@ -1375,7 +1375,7 @@ spring.application.strategy.hystrix.threadlocal.supported=true # 环境路由：环境隔离下，调用端实例找不到符合条件的提供端实例，把流量路由到一个通用或者备份环境，例如：元数据Metadata环境配置值为common（该值可配置，但不允许为保留值default） spring.application.environment.isolation.enabled=true # 流量路由到指定的环境下。不允许为保留值default，缺失则默认为common -spring.application.environment.transfer=common +spring.application.environment.route=common # 开启和关闭使用服务名前缀来作为服务组名。缺失则默认为false spring.application.group.generator.enabled=true 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 3ac7330d9c..d9854ad323 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 @@ -30,8 +30,8 @@ public class DiscoveryConstant { public static final String SPRING_APPLICATION_NO_SERVERS_RETRY_AWAIT_TIME = "spring.application.no.servers.retry.await.time"; public static final String SPRING_APPLICATION_NO_SERVERS_NOTIFY_ENABLED = "spring.application.no.servers.notify.enabled"; public static final String SPRING_APPLICATION_ENVIRONMENT_ISOLATION_ENABLED = "spring.application.environment.isolation.enabled"; - public static final String SPRING_APPLICATION_ENVIRONMENT_TRANSFER = "spring.application.environment.transfer"; - public static final String SPRING_APPLICATION_ENVIRONMENT_TRANSFER_VALUE = "common"; + public static final String SPRING_APPLICATION_ENVIRONMENT_ROUTE = "spring.application.environment.route"; + public static final String SPRING_APPLICATION_ENVIRONMENT_ROUTE_VALUE = "common"; public static final String CONTEXT_PATH = "server.servlet.context-path"; diff --git a/discovery-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/discovery-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 71a49ee6f4..3b188d90ed 100644 --- a/discovery-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/discovery-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -103,10 +103,10 @@ "description": "Whether environment isolation is enabled." }, { - "name": "spring.application.environment.transfer", + "name": "spring.application.environment.route", "type": "java.lang.String", "defaultValue": "common", - "description": "If environment isolation failed, an environment will transfer." + "description": "An environment will be routed to." } ] } \ No newline at end of file diff --git a/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/DefaultEnvironmentTransferAdapter.java b/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/DefaultEnvironmentRouteAdapter.java similarity index 68% rename from discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/DefaultEnvironmentTransferAdapter.java rename to discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/DefaultEnvironmentRouteAdapter.java index 2e41affa58..2036135dfe 100644 --- a/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/DefaultEnvironmentTransferAdapter.java +++ b/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/DefaultEnvironmentRouteAdapter.java @@ -14,16 +14,16 @@ import com.nepxion.discovery.common.constant.DiscoveryConstant; -public abstract class DefaultEnvironmentTransferAdapter implements EnvironmentTransferAdapter { +public abstract class DefaultEnvironmentRouteAdapter implements EnvironmentRouteAdapter { @Autowired protected PluginAdapter pluginAdapter; - @Value("${" + DiscoveryConstant.SPRING_APPLICATION_ENVIRONMENT_TRANSFER + ":" + DiscoveryConstant.SPRING_APPLICATION_ENVIRONMENT_TRANSFER_VALUE + "}") - protected String environmentTransfer; + @Value("${" + DiscoveryConstant.SPRING_APPLICATION_ENVIRONMENT_ROUTE + ":" + DiscoveryConstant.SPRING_APPLICATION_ENVIRONMENT_ROUTE_VALUE + "}") + protected String environmentRoute; @Override - public String getTransferredEnvironment() { - return environmentTransfer; + public String getEnvironmentRoute() { + return environmentRoute; } public PluginAdapter getPluginAdapter() { diff --git a/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EnvironmentTransferAdapter.java b/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EnvironmentRouteAdapter.java similarity index 73% rename from discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EnvironmentTransferAdapter.java rename to discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EnvironmentRouteAdapter.java index b64c6cefdb..91e15a08ac 100644 --- a/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EnvironmentTransferAdapter.java +++ b/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EnvironmentRouteAdapter.java @@ -9,10 +9,10 @@ * @version 1.0 */ -public interface EnvironmentTransferAdapter { +public interface EnvironmentRouteAdapter { // 是否要环境路由 - boolean isTransferred(); + boolean isRoutable(); // 路由到哪个环境中 - String getTransferredEnvironment(); + String getEnvironmentRoute(); } \ No newline at end of file diff --git a/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/EnvironmentFilterDiscoveryListener.java b/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/EnvironmentFilterDiscoveryListener.java index 3cd962c057..9348cac8d4 100644 --- a/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/EnvironmentFilterDiscoveryListener.java +++ b/discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/EnvironmentFilterDiscoveryListener.java @@ -16,11 +16,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.client.ServiceInstance; -import com.nepxion.discovery.plugin.framework.adapter.EnvironmentTransferAdapter; +import com.nepxion.discovery.plugin.framework.adapter.EnvironmentRouteAdapter; public class EnvironmentFilterDiscoveryListener extends AbstractDiscoveryListener { @Autowired(required = false) - private EnvironmentTransferAdapter environmentTransferAdapter; + private EnvironmentRouteAdapter environmentRouteAdapter; @Override public void onGetInstances(String serviceId, List instances) { @@ -41,8 +41,8 @@ private void applyEnvironmentFilter(String providerServiceId, List servers) { @@ -41,8 +41,8 @@ private void applyEnvironmentFilter(String providerServiceId, List