diff --git a/pom.xml b/pom.xml index 69d9b1295..bc70f604c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-build</artifactId> - <version>3.0.5</version> + <version>2.3.5.RELEASE</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> @@ -16,7 +16,7 @@ <version>${revision}</version> <name>Spring Cloud Tencent</name> <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> <name>Tencent</name> @@ -26,7 +26,7 @@ <licenses> <license> <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> </license> </licenses> diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/OrderConstant.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/OrderConstant.java index 177a6a6fe..1f9cdcef2 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/OrderConstant.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/OrderConstant.java @@ -172,17 +172,17 @@ public class OrderConstant { /** * 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. */ - 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. */ - 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. diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 4b6fd9fa2..e49d7c556 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -73,7 +73,7 @@ <revision>1.12.0-Hoxton.SR12-SNAPSHOT</revision> <!-- Dependencies --> - <polaris.version>1.13.0</polaris.version> + <polaris.version>1.14.0-SNAPSHOT</polaris.version> <guava.version>32.0.1-jre</guava.version> <logback.version>1.2.11</logback.version> <mocktio.version>4.5.1</mocktio.version> diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java index e1556c82d..2ace4619c 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PolarisEnhancedPluginUtils.java @@ -75,17 +75,17 @@ import static org.springframework.http.HttpStatus.VARIANT_ALSO_NEGOTIATES; */ public final class PolarisEnhancedPluginUtils { - private PolarisEnhancedPluginUtils() { - - } - private static final Logger LOG = LoggerFactory.getLogger(PolarisEnhancedPluginUtils.class); private static final List<HttpStatus> HTTP_STATUSES = toList(NOT_IMPLEMENTED, BAD_GATEWAY, SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT, HTTP_VERSION_NOT_SUPPORTED, VARIANT_ALSO_NEGOTIATES, INSUFFICIENT_STORAGE, LOOP_DETECTED, BANDWIDTH_LIMIT_EXCEEDED, NOT_EXTENDED, NETWORK_AUTHENTICATION_REQUIRED); + private PolarisEnhancedPluginUtils() { + + } /** * createServiceCallResult. + * @param callerHost caller host ip * @param calleeServiceName 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 @@ -168,7 +168,8 @@ public final class PolarisEnhancedPluginUtils { } RpcEnhancementReporterProperties reportProperties; try { - reportProperties = ApplicationContextAwareUtils.getApplicationContext().getBean(RpcEnhancementReporterProperties.class); + reportProperties = ApplicationContextAwareUtils.getApplicationContext() + .getBean(RpcEnhancementReporterProperties.class); } catch (BeansException e) { LOG.error("get RpcEnhancementReporterProperties bean err", e); @@ -279,5 +280,4 @@ public final class PolarisEnhancedPluginUtils { return null; } - }