From 497158b495b957d1bae24c252c67378f10479074 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Fri, 28 Jul 2023 16:36:57 +0800 Subject: [PATCH] fix:update some modifier order. --- .../tencent/cloud/common/constant/OrderConstant.java | 6 +++--- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../plugin/PolarisEnhancedPluginUtils.java | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) 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 bb1acfa60..67c67c0fe 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 @@ -130,17 +130,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 e5ecf8d11..db87d3ff6 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -73,7 +73,7 @@ 1.12.0-2021.0.6-SNAPSHOT - 1.13.0 + 1.14.0-SNAPSHOT 32.0.1-jre 1.2.11 4.5.1 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 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; } - }