fix: close inputStream error

Author: hb0730

src/main/java/com/hb0730/https/support/SimpleHttpResponse.java

@@ -1,12 +1,10 @@
 package com.hb0730.https.support;
 
-import cn.hutool.core.io.IoUtil;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -35,7 +33,7 @@ public class SimpleHttpResponse {
     /**
      * body stream
      */
-    private InputStream body;
+    private byte[] body;
 
     /**
      * 获取body，默认UTF-8编码
@@ -54,11 +52,11 @@ public String getBodyStr() {
      * @return body
      */
     public String getBodyStr(Charset charset) {
-        return IoUtil.read(this.body, charset);
+        return new String(this.body, charset);
     }
 
     public SimpleHttpResponse body(byte[] body) {
-        this.body = IoUtil.toStream(body);
+        this.body = body;
         return this;
     }
 }

src/main/java/com/hb0730/https/support/httpclient/HttpClientSyncImpl.java

@@ -1,5 +1,6 @@
 package com.hb0730.https.support.httpclient;
 
+import cn.hutool.core.io.IoUtil;
 import com.hb0730.https.HttpHeader;
 import com.hb0730.https.config.HttpConfig;
 import com.hb0730.https.constants.Constants;
@@ -130,6 +131,7 @@ public SimpleHttpResponse post(String url, String dataJson, HttpHeader header) {
         addHeader(uriRequest, header);
         return this.exec(uriRequest);
     }
+
     @Override
     public SimpleHttpResponse post(String url, Map<String, String> formdata) {
         return post(url, formdata, null);
@@ -202,7 +204,7 @@ private SimpleHttpResponse exec(HttpUriRequest request) {
                     , (v1Value, v2Value) -> v2Value));
             return SimpleHttpResponse.builder()
                 .success(success)
-                .body(entity.getContent()).headers(headers).build();
+                .body(IoUtil.readBytes(entity.getContent(), false)).headers(headers).build();
         } catch (IOException e) {
             throw new HttpException("request error:" + e.getMessage());
         }

src/main/java/com/hb0730/https/support/hutool/HutoolAsyncImpl.java

@@ -79,7 +79,7 @@ private void response(HttpCallback httpCallback, HttpRequest request) {
             SimpleHttpResponse.SimpleHttpResponseBuilder body = SimpleHttpResponse.builder()
                 .success(response.isOk())
                 .headers(response.headers())
-                .body(response.bodyStream());
+                .body(response.bodyBytes());
             httpCallback.response(body.build());
         } catch (IOException e) {
             httpCallback.failure(e);

src/main/java/com/hb0730/https/support/hutool/HutoolSyncImpl.java

@@ -41,11 +41,7 @@ public SimpleHttpResponse get(String url, Map<String, String> params) {
         }
         UrlBuilder builder = urlBuilder(url, params, httpConfig.getCharset(), httpConfig.isEncode());
         HttpRequest request = getRequest(builder, Method.GET);
-        HttpResponse execute = request.execute();
-        return SimpleHttpResponse.builder()
-            .success(execute.isOk())
-            .headers(execute.headers())
-            .body(execute.bodyStream()).build();
+        return this.exec(request);
     }
 
     @Override
@@ -69,12 +65,7 @@ public SimpleHttpResponse post(String url, String dataJson, HttpHeader header) {
             request.addHeaders(header.getHeaders());
         }
         request.body(dataJson, getContentType(Constants.CONTENT_TYPE_JSON_UTF_8));
-        HttpResponse execute = request.execute();
-        return SimpleHttpResponse.builder()
-            .success(execute.isOk())
-            .body(execute.bodyStream())
-            .headers(execute.headers())
-            .build();
+        return this.exec(request);
     }
 
     @Override
@@ -94,12 +85,20 @@ public SimpleHttpResponse post(String url, Map<String, String> formData, HttpHea
         if (null != header) {
             request.addHeaders(header.getHeaders());
         }
-        HttpResponse execute = request.execute();
-        return SimpleHttpResponse.builder()
-            .success(execute.isOk())
-            .body(execute.bodyStream())
-            .headers(execute.headers())
-            .build();
+        return this.exec(request);
+
+    }
+
+    private SimpleHttpResponse exec(HttpRequest request) {
+        try (HttpResponse response = request.execute()) {
+            return SimpleHttpResponse.builder()
+                .success(response.isOk())
+                .body(response.bodyBytes())
+                .headers(response.headers())
+                .build();
+        } catch (Exception e) {
+            throw new com.hb0730.https.exception.HttpException("request error:" + e.getMessage());
+        }
     }
 
     private HttpRequest getRequest(UrlBuilder url, Method method) {

src/main/java/com/hb0730/https/support/okhttp3/OkHttp3AsyncImpl.java

@@ -103,7 +103,7 @@ public void onResponse(Call call, Response response) throws IOException {
                     SimpleHttpResponse httpResponse = SimpleHttpResponse.builder()
                         .success(response.isSuccessful())
                         .headers(response.headers().toMultimap())
-                        .body(responseBody.byteStream()).build();
+                        .body(responseBody == null ? null : responseBody.bytes()).build();
                     httpCallback.response(httpResponse);
                 }
             }

src/main/java/com/hb0730/https/support/okhttp3/OkHttp3SyncImpl.java

@@ -1,8 +1,8 @@
 package com.hb0730.https.support.okhttp3;
 
+import cn.hutool.core.io.IoUtil;
 import com.hb0730.https.HttpHeader;
 import com.hb0730.https.config.HttpConfig;
-import com.hb0730.https.constants.Constants;
 import com.hb0730.https.exception.HttpException;
 import com.hb0730.https.inter.AbstractSyncHttp;
 import com.hb0730.https.support.SimpleHttpResponse;
@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * okhttp3 sync impl
@@ -118,7 +117,7 @@ private SimpleHttpResponse exec(Request.Builder requestBuilder) {
             return SimpleHttpResponse.builder()
                 .success(response.isSuccessful())
                 .headers(response.headers().toMultimap())
-                .body(stream).build();
+                .body(IoUtil.readBytes(stream, false)).build();
         } catch (IOException e) {
             throw new HttpException("http execute error:" + e.getMessage(), e);
         }