From 3be97408da60e6b7dbaa1b4a614a6417efdcd2ac Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Mon, 18 Apr 2022 17:06:27 +0800 Subject: [PATCH] feat:release 1.3.0-Hoxton.SR9. --- pom.xml | 2 +- .../cloud/polaris/discovery/DiscoveryEnabledCondition.java | 7 ++++--- .../cloud/polaris/registry/RegisterEnabledCondition.java | 7 ++++--- spring-cloud-tencent-dependencies/pom.xml | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 7d6e815c9..79c84e062 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ - 1.3.0-Hoxton.SR9-SNAPSHOT + 1.3.0-Hoxton.SR9 Hoxton.SR9 diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java index 036323d5f..84041557f 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java @@ -36,9 +36,10 @@ public class DiscoveryEnabledCondition implements Condition { .parseBoolean(conditionContext.getEnvironment() .getProperty("spring.cloud.polaris.discovery.enabled", "true")); - boolean isConsulDiscoveryEnabled = Boolean.parseBoolean(conditionContext.getEnvironment() - .getProperty("spring.cloud.consul.enabled", "false")) && - Boolean.parseBoolean(conditionContext.getEnvironment() + boolean isConsulDiscoveryEnabled = Boolean + .parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.consul.enabled", "false")) + && Boolean.parseBoolean(conditionContext.getEnvironment() .getProperty("spring.cloud.consul.discovery.enabled", "true")); isDiscoveryEnabled |= isConsulDiscoveryEnabled; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java index 60cb5e0f0..c7820fb6a 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java @@ -34,9 +34,10 @@ public class RegisterEnabledCondition implements Condition { boolean isRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment() .getProperty("spring.cloud.polaris.discovery.register", "true")); - boolean isConsulRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment() - .getProperty("spring.cloud.consul.enabled", "false")) && - Boolean.parseBoolean(conditionContext.getEnvironment() + boolean isConsulRegisterEnabled = Boolean + .parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.consul.enabled", "false")) + && Boolean.parseBoolean(conditionContext.getEnvironment() .getProperty("spring.cloud.consul.discovery.register", "true")); isRegisterEnabled |= isConsulRegisterEnabled; diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 406a7ebec..f0a70b04c 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,8 +70,8 @@ - 1.3.0-Hoxton.SR9-SNAPSHOT - 1.4.0-SNAPSHOT + 1.3.0-Hoxton.SR9 + 1.4.0 2.0.0