From a59011fa93ece691719805c7819743d9b4f60fe3 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Wed, 13 Mar 2019 15:56:26 +0800 Subject: [PATCH] add switch for @SentinelRestTemplate --- .../alibaba/sentinel/custom/SentinelAutoConfiguration.java | 1 + .../META-INF/additional-spring-configuration-metadata.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java index 3c908bec..b0db45dd 100644 --- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java @@ -166,6 +166,7 @@ public class SentinelAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnClass(name = "org.springframework.web.client.RestTemplate") + @ConditionalOnProperty(name = "resttemplate.sentinel.enabled", havingValue = "true", matchIfMissing = true) public SentinelBeanPostProcessor sentinelBeanPostProcessor( ApplicationContext applicationContext) { return new SentinelBeanPostProcessor(applicationContext); diff --git a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 80fec1a5..21713de7 100644 --- a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -6,6 +6,12 @@ "defaultValue": true, "description": "enable or disable sentinel auto configure." }, + { + "name": "resttemplate.sentinel.enabled", + "type": "java.lang.Boolean", + "defaultValue": true, + "description": "enable or disable @SentinelRestTemplate." + }, { "name": "spring.cloud.sentinel.eager", "type": "java.lang.Boolean",