diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 62e2c443..4abfc39f 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -127,6 +127,18 @@ sentinel-dubbo-api ${project.version} + + com.alibaba.csp + sentinel-cluster-server-default + ${sentinel.version} + + + com.alibaba.csp + sentinel-cluster-client-default + ${sentinel.version} + + + org.apache.rocketmq rocketmq-client diff --git a/spring-cloud-alibaba-sentinel/pom.xml b/spring-cloud-alibaba-sentinel/pom.xml index dba86dfb..e3b46726 100644 --- a/spring-cloud-alibaba-sentinel/pom.xml +++ b/spring-cloud-alibaba-sentinel/pom.xml @@ -35,6 +35,16 @@ sentinel-dubbo-adapter + + com.alibaba.csp + sentinel-cluster-server-default + + + + com.alibaba.csp + sentinel-cluster-client-default + + org.springframework.cloud spring-cloud-starter-openfeign diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java index 76e4a3b8..6de453d4 100644 --- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java @@ -16,6 +16,13 @@ package org.springframework.cloud.alibaba.sentinel.rest; +import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate; +import org.springframework.cloud.alibaba.sentinel.custom.SentinelProtectInterceptor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.client.AbstractClientHttpResponse; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -24,20 +31,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate; -import org.springframework.cloud.alibaba.sentinel.custom.SentinelProtectInterceptor; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.client.AbstractClientHttpResponse; - /** * Using by {@link SentinelRestTemplate} and {@link SentinelProtectInterceptor} + * * @author Jim */ public class SentinelClientHttpResponse extends AbstractClientHttpResponse { - private final String BLOCK_STR = "RestTemplate request block by sentinel"; + private String blockResponse = "RestTemplate request block by sentinel"; + + public SentinelClientHttpResponse() { + + } + + public SentinelClientHttpResponse(String blockResponse) { + this.blockResponse = blockResponse; + } @Override public int getRawStatusCode() throws IOException { @@ -46,7 +55,7 @@ public class SentinelClientHttpResponse extends AbstractClientHttpResponse { @Override public String getStatusText() throws IOException { - return BLOCK_STR; + return blockResponse; } @Override @@ -56,7 +65,7 @@ public class SentinelClientHttpResponse extends AbstractClientHttpResponse { @Override public InputStream getBody() throws IOException { - return new ByteArrayInputStream(BLOCK_STR.getBytes()); + return new ByteArrayInputStream(blockResponse.getBytes()); } @Override