From 73f1c2a796b50616bba09ec40f871fe92f3d8084 Mon Sep 17 00:00:00 2001 From: shedfreewu Date: Fri, 6 Dec 2024 19:37:33 +0800 Subject: [PATCH] fix review --- .../cloud/common/tsf/ConditionalOnTsfConsulEnabled.java | 3 --- .../config/extend/tsf/TsfCoreEnvironmentPostProcessor.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/tsf/ConditionalOnTsfConsulEnabled.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/tsf/ConditionalOnTsfConsulEnabled.java index 6d3a2aad2..f576d219e 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/tsf/ConditionalOnTsfConsulEnabled.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/tsf/ConditionalOnTsfConsulEnabled.java @@ -45,9 +45,6 @@ public @interface ConditionalOnTsfConsulEnabled { @Override public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) { Environment environment = conditionContext.getEnvironment(); - if (Boolean.TRUE.toString().equals(environment.getProperty("tsf_consul_enable"))) { - return true; - } boolean tsfConsulEnable = false; String tsfAppId = environment.getProperty("tsf_app_id"); diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java index 045f634dd..35dac9350 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java @@ -109,8 +109,6 @@ public final class TsfCoreEnvironmentPostProcessor implements EnvironmentPostPro LOGGER.error("tsf_namespace_id is empty"); } - defaultProperties.put("tsf_consul_enable", "true"); - // context defaultProperties.put("spring.cloud.polaris.enabled", "true"); defaultProperties.put("spring.cloud.polaris.discovery.enabled", "false");