Merge branch 'main' of github.com:Tencent/spring-cloud-tencent

 Conflicts:

	spring-cloud-tencent-polaris-context/pom.xml

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfiguration.java

@@ -20,7 +20,9 @@ package com.tencent.cloud.polaris.circuitbreaker;
 import com.tencent.cloud.common.constant.ContextConstant;
 import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
 import com.tencent.cloud.polaris.context.PolarisConfigModifier;
+import com.tencent.polaris.api.config.consumer.ServiceRouterConfig;
 import com.tencent.polaris.factory.config.ConfigurationImpl;
+import com.tencent.polaris.plugins.router.healthy.RecoverRouterConfig;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -48,6 +50,16 @@ public class PolarisCircuitBreakerBootstrapConfiguration {
 		public void modify(ConfigurationImpl configuration) {
 			// Turn on circuitbreaker configuration
 			configuration.getConsumer().getCircuitBreaker().setEnable(true);
+
+			// Set excludeCircuitBreakInstances to false 
+			RecoverRouterConfig recoverRouterConfig = configuration.getConsumer().getServiceRouter()
+					.getPluginConfig(ServiceRouterConfig.DEFAULT_ROUTER_RECOVER, RecoverRouterConfig.class);
+
+			recoverRouterConfig.setExcludeCircuitBreakInstances(true);
+
+			// Update modified config to source properties
+			configuration.getConsumer().getServiceRouter()
+					.setPluginConfig(ServiceRouterConfig.DEFAULT_ROUTER_RECOVER, recoverRouterConfig);
 		}
 
 		@Override

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryConfigModifier.java

@@ -0,0 +1,50 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.polaris;
+
+import com.tencent.cloud.common.constant.ContextConstant;
+import com.tencent.cloud.polaris.context.PolarisConfigModifier;
+import com.tencent.polaris.api.config.consumer.ServiceRouterConfig;
+import com.tencent.polaris.factory.config.ConfigurationImpl;
+import com.tencent.polaris.plugins.router.healthy.RecoverRouterConfig;
+
+/**
+ *  Spring Cloud Tencent config Override polaris config.
+ *
+ *@author lepdou 2022-04-24
+ */
+public class DiscoveryConfigModifier implements PolarisConfigModifier {
+
+	@Override
+	public void modify(ConfigurationImpl configuration) {
+		// Set excludeCircuitBreakInstances to false
+		RecoverRouterConfig recoverRouterConfig = configuration.getConsumer().getServiceRouter()
+				.getPluginConfig(ServiceRouterConfig.DEFAULT_ROUTER_RECOVER, RecoverRouterConfig.class);
+		recoverRouterConfig.setExcludeCircuitBreakInstances(false);
+
+		// Update modified config to source properties
+		configuration.getConsumer().getServiceRouter()
+				.setPluginConfig(ServiceRouterConfig.DEFAULT_ROUTER_RECOVER, recoverRouterConfig);
+	}
+
+	@Override
+	public int getOrder() {
+		return ContextConstant.ModifierOrder.DISCOVERY_ORDER;
+	}
+}

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java

@@ -74,6 +74,11 @@ public class DiscoveryPropertiesAutoConfiguration {
 		return new PolarisDiscoveryHandler();
 	}
 
+	@Bean
+	public DiscoveryConfigModifier discoveryConfigModifier() {
+		return new DiscoveryConfigModifier();
+	}
+
 	@PostConstruct
 	public void init() {
 		if (null != polarisDiscoveryProperties) {

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/ContextConstant.java

@@ -52,6 +52,11 @@ public final class ContextConstant {
 		 */
 		public static Integer CIRCUIT_BREAKER_ORDER = 1;
 
+		/**
+		 * Order of discovery configuration modifier.
+		 */
+		public static Integer DISCOVERY_ORDER = 0;
+
 		/**
 		 * Order of configuration modifier.
 		 */

spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisContextProperties.java

@@ -74,11 +74,14 @@ public class PolarisContextProperties {
 	private List<PolarisConfigModifier> modifierList;
 
 	protected Configuration configuration() {
+		// 1. Read user-defined polaris.yml configuration
 		ConfigurationImpl configuration = (ConfigurationImpl) ConfigAPIFactory
 				.defaultConfig(ConfigProvider.DEFAULT_CONFIG);
-		configuration.setDefault();
+
+		// 2. Override user-defined polaris.yml configuration with SCT configuration
 		String defaultHost = getHost();
 		configuration.getGlobal().getAPI().setBindIP(defaultHost);
+
 		Collection<PolarisConfigModifier> modifiers = modifierList;
 		modifiers = modifiers.stream()
 				.sorted(Comparator.comparingInt(PolarisConfigModifier::getOrder))
@@ -88,6 +91,7 @@ public class PolarisContextProperties {
 				modifier.modify(configuration);
 			}
 		}
+
 		return configuration;
 	}