添加读取request body的控制开关

Author: saleson

spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/autoconfig/BambooAutoConfiguration.java

@@ -1,6 +1,7 @@
 package cn.springcloud.bamboo.autoconfig;
 
 import cn.springcloud.bamboo.*;
+import cn.springcloud.bamboo.autoconfig.properties.BambooProperties;
 import cn.springcloud.bamboo.feign.config.BambooFeignConfiguration;
 import cn.springcloud.bamboo.ribbon.BambooClientHttpRequestIntercptor;
 import cn.springcloud.bamboo.ribbon.EurekaServerExtractor;
@@ -25,7 +26,7 @@
  * Created by saleson on 2017/11/9.
  */
 @Configuration
-@EnableConfigurationProperties
+@EnableConfigurationProperties({BambooProperties.class})
 @AutoConfigureBefore({BambooFeignConfiguration.class, BambooZuulConfiguration.class})
 @Import(BambooWebConfiguration.class)
 //@RibbonClients(defaultConfiguration = {BambooExtConfigration.class})
@@ -43,13 +44,15 @@ public static class UnUseBambooIRule {
 
     @Autowired
     private SpringClientFactory springClientFactory;
+    @Autowired
+    private BambooProperties bambooProperties;
 
 
     @Bean
     @LoadBalanced
     public RestTemplate restTemplate() {
         RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getInterceptors().add(new BambooClientHttpRequestIntercptor());
+        restTemplate.getInterceptors().add(new BambooClientHttpRequestIntercptor(bambooProperties));
         return restTemplate;
     }
 

spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/autoconfig/properties/BambooProperties.java

@@ -0,0 +1,36 @@
+package cn.springcloud.bamboo.autoconfig.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("multiversion")
+public class BambooProperties {
+
+    private BambooRequest bambooRequest = new BambooRequest();
+
+    public BambooRequest getBambooRequest() {
+        return bambooRequest;
+    }
+
+    public void setBambooRequest(BambooRequest bambooRequest) {
+        this.bambooRequest = bambooRequest;
+    }
+
+    public static class BambooRequest {
+
+        private boolean loadBody = false;
+
+        /**
+         * 是否读取并加载请求的body数据
+         *
+         * @return
+         */
+        public boolean isLoadBody() {
+            return loadBody;
+        }
+
+        public void setLoadBody(boolean loadBody) {
+            this.loadBody = loadBody;
+        }
+    }
+
+}

spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/feign/BambooFeignClient.java

@@ -3,6 +3,7 @@
 import cn.springcloud.bamboo.BambooAppContext;
 import cn.springcloud.bamboo.BambooRequest;
 import cn.springcloud.bamboo.ConnectPointContext;
+import cn.springcloud.bamboo.autoconfig.properties.BambooProperties;
 import cn.springcloud.bamboo.utils.WebUtils;
 import cn.springcloud.bamboo.web.RequestIpKeeper;
 import feign.Client;
@@ -18,6 +19,7 @@
 public class BambooFeignClient implements Client {
 
     private Client delegate;
+    private BambooProperties bambooProperties;
 
 
     public BambooFeignClient(Client delegate) {
@@ -31,8 +33,11 @@ public Response execute(Request request, Request.Options options) throws IOExcep
                 .serviceId(uri.getHost())
                 .uri(uri.getPath())
                 .ip(RequestIpKeeper.getRequestIp())
-                .addMultiParams(WebUtils.getQueryParams(uri.getQuery()))
-                .requestBody(request.body());
+                .addMultiParams(WebUtils.getQueryParams(uri.getQuery()));
+        if(bambooProperties.getBambooRequest().isLoadBody()){
+            builder.requestBody(request.body());
+        }
+
 
         request.headers().entrySet().forEach(entry ->{
             for (String v : entry.getValue()) {

spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/ribbon/BambooClientHttpRequestIntercptor.java

@@ -3,6 +3,7 @@
 import cn.springcloud.bamboo.BambooAppContext;
 import cn.springcloud.bamboo.BambooRequest;
 import cn.springcloud.bamboo.ConnectPointContext;
+import cn.springcloud.bamboo.autoconfig.properties.BambooProperties;
 import cn.springcloud.bamboo.utils.WebUtils;
 import cn.springcloud.bamboo.web.RequestIpKeeper;
 import org.springframework.http.HttpRequest;
@@ -18,18 +19,29 @@
  * 用于@LoadBalance 标记的 RestTemplate，主要作用是用来获取request的相关信息，为后面的路由提供数据基础。
  */
 public class BambooClientHttpRequestIntercptor implements ClientHttpRequestInterceptor {
+
+    private BambooProperties bambooProperties;
+
+    public BambooClientHttpRequestIntercptor(BambooProperties bambooProperties) {
+        this.bambooProperties = bambooProperties;
+    }
+
     @Override
     public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
 
         URI uri = request.getURI();
-        BambooRequest bambooRequest = BambooRequest.builder()
+        BambooRequest.Builder bambooReqBuilder = BambooRequest.builder()
                 .serviceId(uri.getHost())
                 .uri(uri.getPath())
                 .ip(RequestIpKeeper.getRequestIp())
                 .addMultiHeaders(request.getHeaders())
-                .addMultiParams(WebUtils.getQueryParams(uri.getQuery()))
-                .requestBody(body)
-                .build();
+                .addMultiParams(WebUtils.getQueryParams(uri.getQuery()));
+
+        if(bambooProperties.getBambooRequest().isLoadBody()) {
+            bambooReqBuilder.requestBody(body);
+        }
+
+        BambooRequest bambooRequest = bambooReqBuilder.build();
 
         ConnectPointContext connectPointContext = ConnectPointContext.builder().bambooRequest(bambooRequest).build();
         try {

spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/zuul/config/BambooZuulConfiguration.java

@@ -1,19 +1,23 @@
 package cn.springcloud.bamboo.zuul.config;
 
+import cn.springcloud.bamboo.autoconfig.properties.BambooProperties;
 import cn.springcloud.bamboo.zuul.filter.BambooPostZuulFilter;
 import cn.springcloud.bamboo.zuul.filter.BambooPreZuulFilter;
 import com.netflix.zuul.http.ZuulServlet;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @ConditionalOnClass(value = ZuulServlet.class)
 public class BambooZuulConfiguration {
+    @Autowired
+    private BambooProperties bambooProperties;
 
     @Bean
     public BambooPreZuulFilter bambooPreZuulFilter(){
-        return new BambooPreZuulFilter();
+        return new BambooPreZuulFilter(bambooProperties);
     }
 
     @Bean

spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/zuul/filter/BambooPreZuulFilter.java

@@ -3,6 +3,7 @@
 import cn.springcloud.bamboo.BambooAppContext;
 import cn.springcloud.bamboo.BambooRequest;
 import cn.springcloud.bamboo.ConnectPointContext;
+import cn.springcloud.bamboo.autoconfig.properties.BambooProperties;
 import com.netflix.util.Pair;
 import com.netflix.zuul.ZuulFilter;
 import com.netflix.zuul.context.RequestContext;
@@ -23,6 +24,12 @@ public class BambooPreZuulFilter extends ZuulFilter {
 
     private static final Logger log = LoggerFactory.getLogger(BambooPreZuulFilter.class);
 
+    private BambooProperties bambooProperties;
+
+    public BambooPreZuulFilter(BambooProperties bambooProperties) {
+        this.bambooProperties = bambooProperties;
+    }
+
     @Override
     public String filterType() {
         return FilterConstants.PRE_TYPE;
@@ -50,14 +57,16 @@ public Object run() {
                 .addHeaders(context.getOriginResponseHeaders().stream().collect(Collectors.toMap(Pair::first, Pair::second)));
         context.getOriginResponseHeaders().forEach(pair-> builder.addHeader(pair.first(), pair.second()));
 
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(context.getRequest().getInputStream()));
-            byte[] reqBody = IOUtils.toByteArray(reader);
-            builder.requestBody(reqBody);
-        }catch (IOException e){
-            String errorMsg = "获取request body出现异常";
-            log.error(errorMsg, e);
-            throw new RuntimeException(errorMsg, e);
+        if(bambooProperties.getBambooRequest().isLoadBody()) {
+            try {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(context.getRequest().getInputStream()));
+                byte[] reqBody = IOUtils.toByteArray(reader);
+                builder.requestBody(reqBody);
+            } catch (IOException e) {
+                String errorMsg = "获取request body出现异常";
+                log.error(errorMsg, e);
+                throw new RuntimeException(errorMsg, e);
+            }
         }
 
         ConnectPointContext connectPointContext = ConnectPointContext.builder().bambooRequest(builder.build()).build();