Merge branch '2021' into 2021-lane-router

CHANGELOG.md

@@ -17,4 +17,5 @@
 - [fix: fix parsing ConfigurationProperties value with RefreshScope.](https://github.com/Tencent/spring-cloud-tencent/pull/1781)
 - [refactor: optimize performance.](https://github.com/Tencent/spring-cloud-tencent/pull/1782)
 - [fix: fix NacosDiscoveryRegistryAutoConfiguration and PolarisAuthAutoConfiguration still initiation when polaris disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1783)
+- [fix: fix cb rule no update bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1786)
 - [feat: support traffic gray lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1785)

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java

@@ -64,9 +64,9 @@ public class ConfigurationModifier implements PolarisConfigurationConfigModifier
 
 	@Override
 	public void modify(ConfigurationImpl configuration) {
-		configuration.getGlobal().getAPI().setReportEnable(false);
 		configuration.getGlobal().getStatReporter().setEnable(false);
 		configuration.getConsumer().getOutlierDetection().setWhen(OutlierDetectionConfig.When.never);
+		configuration.getConsumer().getCircuitBreaker().setEnable(false);
 
 		if (!polarisContextProperties.getEnabled() || !polarisConfigProperties.isEnabled()) {
 			return;

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/configdata/PolarisConfigDataLocationResolver.java

@@ -275,9 +275,11 @@ public class PolarisConfigDataLocationResolver implements
 		if (!bootstrapContext.isRegistered(SDKContext.class)) {
 			SDKContext sdkContext = sdkContext(resolverContext,
 					polarisConfigProperties, polarisCryptoConfigProperties, polarisContextProperties);
-			// not init reporter when creating config data temp SDK context.
 			if (sdkContext.getConfig() instanceof ConfigurationImpl) {
+				// not init reporter when creating config data temp SDK context.
 				((ConfigurationImpl) sdkContext.getConfig()).getGlobal().getStatReporter().setEnable(false);
+				// not init circuit breaker when creating config data temp SDK context.
+				((ConfigurationImpl) sdkContext.getConfig()).getConsumer().getCircuitBreaker().setEnable(false);
 			}
 			sdkContext.init();
 			PolarisConfigSDKContextManager.setConfigSDKContext(sdkContext);