fix:update some modifier order.

pull/1080/head
Haotian Zhang 2 years ago
parent aae97b61fa
commit 026437f233

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId> <artifactId>spring-cloud-build</artifactId>
<version>3.0.5</version> <version>2.3.5.RELEASE</version>
<relativePath/> <relativePath/>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -16,7 +16,7 @@
<version>${revision}</version> <version>${revision}</version>
<name>Spring Cloud Tencent</name> <name>Spring Cloud Tencent</name>
<description>Spring Cloud Tencent</description> <description>Spring Cloud Tencent</description>
<url>https://github.com/Tencent/spring-cloud-tencent/tree/2020.0</url> <url>https://github.com/Tencent/spring-cloud-tencent/tree/hoxton</url>
<organization> <organization>
<name>Tencent</name> <name>Tencent</name>
@ -26,7 +26,7 @@
<licenses> <licenses>
<license> <license>
<name>The BSD 3-Clause License (BSD3)</name> <name>The BSD 3-Clause License (BSD3)</name>
<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2020.0/LICENSE</url> <url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/hoxton/LICENSE</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>

@ -172,17 +172,17 @@ public class OrderConstant {
/** /**
* Discovery config modifier order. * Discovery config modifier order.
*/ */
public static Integer DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE; public static Integer DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE - 10;
/** /**
* Nacos discovery config modifier order. * Nacos discovery config modifier order.
*/ */
public static Integer NACOS_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE; public static Integer NACOS_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE - 10;
/** /**
* Consul discovery config modifier order. * Consul discovery config modifier order.
*/ */
public static Integer CONSUL_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE; public static Integer CONSUL_DISCOVERY_CONFIG_ORDER = Integer.MAX_VALUE - 10;
/** /**
* Order of discovery configuration modifier. * Order of discovery configuration modifier.

@ -73,7 +73,7 @@
<revision>1.12.0-Hoxton.SR12-SNAPSHOT</revision> <revision>1.12.0-Hoxton.SR12-SNAPSHOT</revision>
<!-- Dependencies --> <!-- Dependencies -->
<polaris.version>1.13.0</polaris.version> <polaris.version>1.14.0-SNAPSHOT</polaris.version>
<guava.version>32.0.1-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
<logback.version>1.2.11</logback.version> <logback.version>1.2.11</logback.version>
<mocktio.version>4.5.1</mocktio.version> <mocktio.version>4.5.1</mocktio.version>

@ -75,17 +75,17 @@ import static org.springframework.http.HttpStatus.VARIANT_ALSO_NEGOTIATES;
*/ */
public final class PolarisEnhancedPluginUtils { public final class PolarisEnhancedPluginUtils {
private PolarisEnhancedPluginUtils() {
}
private static final Logger LOG = LoggerFactory.getLogger(PolarisEnhancedPluginUtils.class); private static final Logger LOG = LoggerFactory.getLogger(PolarisEnhancedPluginUtils.class);
private static final List<HttpStatus> HTTP_STATUSES = toList(NOT_IMPLEMENTED, BAD_GATEWAY, private static final List<HttpStatus> HTTP_STATUSES = toList(NOT_IMPLEMENTED, BAD_GATEWAY,
SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT, HTTP_VERSION_NOT_SUPPORTED, VARIANT_ALSO_NEGOTIATES, SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT, HTTP_VERSION_NOT_SUPPORTED, VARIANT_ALSO_NEGOTIATES,
INSUFFICIENT_STORAGE, LOOP_DETECTED, BANDWIDTH_LIMIT_EXCEEDED, NOT_EXTENDED, NETWORK_AUTHENTICATION_REQUIRED); INSUFFICIENT_STORAGE, LOOP_DETECTED, BANDWIDTH_LIMIT_EXCEEDED, NOT_EXTENDED, NETWORK_AUTHENTICATION_REQUIRED);
private PolarisEnhancedPluginUtils() {
}
/** /**
* createServiceCallResult. * createServiceCallResult.
* @param callerHost caller host ip
* @param calleeServiceName will pick up url host when null * @param calleeServiceName will pick up url host when null
* @param calleeHost will pick up url host when null * @param calleeHost will pick up url host when null
* @param calleePort will pick up url port when null * @param calleePort will pick up url port when null
@ -168,7 +168,8 @@ public final class PolarisEnhancedPluginUtils {
} }
RpcEnhancementReporterProperties reportProperties; RpcEnhancementReporterProperties reportProperties;
try { try {
reportProperties = ApplicationContextAwareUtils.getApplicationContext().getBean(RpcEnhancementReporterProperties.class); reportProperties = ApplicationContextAwareUtils.getApplicationContext()
.getBean(RpcEnhancementReporterProperties.class);
} }
catch (BeansException e) { catch (BeansException e) {
LOG.error("get RpcEnhancementReporterProperties bean err", e); LOG.error("get RpcEnhancementReporterProperties bean err", e);
@ -279,5 +280,4 @@ public final class PolarisEnhancedPluginUtils {
return null; return null;
} }
} }

Loading…
Cancel
Save