From 4a2abc47cc376d1a8545511886a017db73850db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Fri, 31 Jul 2020 21:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9HttpUtil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 14 ++++++++++
 .../java/cn/celess/blog/util/HttpUtil.java    | 28 ++++++++++++++-----
 .../cn/celess/blog/util/HttpUtilTest.java     | 22 +++++++++++++++
 3 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/cn/celess/blog/util/HttpUtilTest.java

diff --git a/pom.xml b/pom.xml
index cfa39a2..b59af17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,20 @@
             <artifactId>jjwt</artifactId>
             <version>0.9.1</version>
         </dependency>
+
+        <!--    OkHttp  -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>1.3.72</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/src/main/java/cn/celess/blog/util/HttpUtil.java b/src/main/java/cn/celess/blog/util/HttpUtil.java
index 8c37ff0..b34b5e6 100644
--- a/src/main/java/cn/celess/blog/util/HttpUtil.java
+++ b/src/main/java/cn/celess/blog/util/HttpUtil.java
@@ -1,12 +1,11 @@
 package cn.celess.blog.util;
 
-import java.io.BufferedReader;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 
 /**
  * @Author: 小海
@@ -14,8 +13,10 @@ import java.nio.charset.StandardCharsets;
  * @Desc:
  */
 public class HttpUtil {
+    private static final OkHttpClient CLIENT = new OkHttpClient();
 
-    public static String get(String urlStr) throws IOException {
+
+    /*public static String get(String urlStr) throws IOException {
 
         StringBuffer sb = new StringBuffer();
 
@@ -48,4 +49,17 @@ public class HttpUtil {
         }
         return sb.toString();
     }
+*/
+    public static String get(String urlStr) {
+        Request request = new Request.Builder()
+                .url(urlStr)
+                .get()
+                .build();
+        try (Response response = CLIENT.newCall(request).execute()) {
+            return Objects.requireNonNull(response.body()).string();
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
 }
diff --git a/src/test/java/cn/celess/blog/util/HttpUtilTest.java b/src/test/java/cn/celess/blog/util/HttpUtilTest.java
new file mode 100644
index 0000000..9743d69
--- /dev/null
+++ b/src/test/java/cn/celess/blog/util/HttpUtilTest.java
@@ -0,0 +1,22 @@
+package cn.celess.blog.util;
+
+import cn.celess.blog.BaseTest;
+import cn.celess.blog.enmu.ResponseEnum;
+import cn.celess.blog.entity.Response;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+public class HttpUtilTest extends BaseTest {
+
+    @Test
+    public void get() {
+        String s = HttpUtil.get("https://api.celess.cn/headerInfo");
+        assertNotNull(s);
+        Response<Map<String, Object>> response = getResponse(s, MAP_OBJECT_TYPE);
+        assertEquals(ResponseEnum.SUCCESS.getCode(), response.getCode());
+        assertNotEquals(0, response.getResult().size());
+    }
+}
\ No newline at end of file