Merge pull request #8 from volcengine/release/v1.1.2

Release/v1.1.2

Author: zhangpengspin

README.md

@@ -21,3 +21,31 @@ public static void main(String[] args) throws Exception {
     <artifactId>fastjson</artifactId>
     <version>1.2.83</version>
 </dependency>
+<dependency>
+    <groupId>com.squareup.okhttp3</groupId>
+    <artifactId>okhttp</artifactId>
+    <version>4.8.1</version>
+</dependency>
+```
+
+或者在pom中直接添加依赖：
+```xml
+<dependency>
+    <groupId>com.datarangers</groupId>
+    <artifactId>sdk-openapi-java</artifactId>
+    <version>{version}</version>
+</dependency>
+```
+{version} 为 `sdk-openapi-java`的版本。
+
+maven 仓库地址为：
+```xml
+<repositories>
+  <repository>
+    <id>bytedance-volcengine</id>
+    <name>bytedance Volcengine</name>
+    <url>https://artifact.bytedance.com/repository/Volcengine/</url>
+  </repository>
+</repositories>
+
+```

pom.xml

@@ -6,20 +6,27 @@
 
     <groupId>com.datarangers</groupId>
     <artifactId>sdk-openapi-java</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <encoding>UTF-8</encoding>
         <java.version>1.8</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
+    <distributionManagement>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.83</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.8.1</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/com/datarangers/sdk/client/Client.java

@@ -72,7 +72,7 @@ public final String request(String method, String serviceUrl, Map<String, String
         if (!Constants.METHOD_ALLODED.contains(method)) {
             throw new Client.ClientNotSupportException(Constants.METHOD_NOT_SUPPORT + ":" + method);
         }
-        if (params != null) {
+        if (params != null && (!params.isEmpty())) {
             params = new LinkedHashMap<>(params);
         }
         String authorization = DslSign.sign(ak, sk, expiration, method, serviceUrl, params, body);

src/main/java/com/datarangers/sdk/requests/Requests.java

@@ -1,6 +1,7 @@
 package com.datarangers.sdk.requests;
 
 import com.datarangers.sdk.common.Constants;
+import okhttp3.*;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -15,99 +16,57 @@
  * 一些http请求方法
  */
 public class Requests {
+    private static final Object LOCK = new Object();
+    private static volatile OkHttpClient okHttpClient;
+
+    public static void init(OkHttpClient okHttpClient) {
+        if (Requests.okHttpClient != null) {
+            throw new RuntimeException("ok httpclient has init");
+        }
+        Requests.okHttpClient = okHttpClient;
+    }
+
+    private static OkHttpClient getHttpClient() {
+        if (okHttpClient == null) {
+            synchronized (LOCK) {
+                if (okHttpClient == null) {
+                    okHttpClient = new OkHttpClient();
+                }
+            }
+        }
+        return okHttpClient;
+    }
+
     public static String post(String url, Map<String, String> headers, Map<String, String> params, String body) {
-        HttpURLConnection connection = null;
         try {
             if (params != null) {
                 url += formatParams(params);
             }
-            URL urls = new URL(url);
-            connection = (HttpURLConnection) urls.openConnection();
-            //设置请求方式为POST
-            connection.setRequestMethod("POST");
-            for (Map.Entry<String, String> entry : headers.entrySet()) {
-                connection.setRequestProperty(entry.getKey(), entry.getValue());
-            }
-            //允许写出
-            connection.setDoOutput(true);
-            //允许读入
-            connection.setDoInput(true);
-            //不使用缓存
-            connection.setUseCaches(false);
-            connection.connect();//连接
-            if (body != null) {
-                BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(connection.getOutputStream(), "UTF-8"));
-                writer.write(body);
-                writer.close();
-            }
-            connection.getResponseCode();
-            InputStream inputStream = connection.getInputStream();
-            //将流转换为字符串
-            String result = convertStreamToString(inputStream);
-            return result;
-        } catch (ProtocolException e) {
-            e.printStackTrace();
-            return e.toString();
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-            return e.toString();
+            return requestMethod("POST", url, body, headers);
         } catch (IOException e) {
             e.printStackTrace();
             return e.toString();
-        } finally {
-            if (connection != null) {
-                connection.disconnect();
-            }
         }
     }
 
     public static String get(String url) {
-        HttpURLConnection connection = null;
         try {
-            URL urls = new URL(url);
-            connection = (HttpURLConnection) urls.openConnection();
-            connection.setRequestMethod("GET");
-            connection.connect();
-            connection.getResponseCode();
-            InputStream inputStream = connection.getInputStream();
-            //将流转换为字符串
-            String result = convertStreamToString(inputStream);
-            return result;
+            return requestGet(url, new HashMap<>());
         } catch (Exception e) {
             e.printStackTrace();
             return e.toString();
-        } finally {
-            if (connection != null) {
-                connection.disconnect();
-            }
         }
     }
 
     public static String get(String url, Map<String, String> headers, Map<String, String> params) {
-        HttpURLConnection connection = null;
         try {
             if (params != null) {
                 url += formatParams(params);
             }
-            URL urls = new URL(url);
-            connection = (HttpURLConnection) urls.openConnection();
-            connection.setRequestMethod("GET");
-            for (Map.Entry<String, String> entry : headers.entrySet()) {
-                connection.setRequestProperty(entry.getKey(), entry.getValue());
-            }
-            connection.connect();
-            connection.getResponseCode();
-            InputStream inputStream = connection.getInputStream();
-            //将流转换为字符串
-            String result = convertStreamToString(inputStream);
-            return result;
+            return requestGet(url, headers);
         } catch (Exception e) {
             e.printStackTrace();
             return e.toString();
-        } finally {
-            if (connection != null) {
-                connection.disconnect();
-            }
         }
     }
 
@@ -120,17 +79,6 @@ private static String formatParams(Map<String, String> params) {
     }
 
 
-    public static String convertStreamToString(InputStream inputStream) throws IOException {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-        StringBuilder sb = new StringBuilder();
-        String line;
-        while ((line = reader.readLine()) != null) {
-            sb.append(line + System.lineSeparator());
-        }
-        String res = sb.toString();
-        return res;
-    }
-
     public static String requests(String method, String url, Map<String, String> headers, String body, Map<String, String> params) {
         if (Constants.POST.equals(method)) {
             return post(url, headers, params, body);
@@ -150,40 +98,44 @@ public static String requests(String method, String url, Map<String, String> hea
      * <LI>TRACE
      */
     private static String call(String url, Map<String, String> headers, Map<String, String> params, String body, String method) {
-        HttpURLConnection connection = null;
         try {
             if (params != null) {
                 url += formatParams(params);
             }
-            URL urls = new URL(url);
-            connection = (HttpURLConnection) urls.openConnection();
-            //设置请求方式为POST
-            connection.setRequestMethod(method);
-            headers.forEach(connection::setRequestProperty);
-            //允许写出
-            connection.setDoOutput(true);
-            //允许读入
-            connection.setDoInput(true);
-            //不使用缓存
-            connection.setUseCaches(false);
-            //连接
-            connection.connect();
-            if (body != null) {
-                BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(connection.getOutputStream(), "UTF-8"));
-                writer.write(body);
-                writer.close();
-            }
-            connection.getResponseCode();
-            InputStream inputStream = connection.getInputStream();
-            //将流转换为字符串。
-            return convertStreamToString(inputStream);
+            return requestMethod(method, url, body, headers);
         } catch (Exception e) {
             e.printStackTrace();
             return e.toString();
-        } finally {
-            if (connection != null) {
-                connection.disconnect();
+        }
+    }
+
+    private static String requestGet(String url, Map<String, String> headers) throws IOException {
+        Request request = new Request.Builder()
+                .url(url)
+                .headers(Headers.of(headers))
+                .build();
+        return getResponse(request);
+    }
+
+    private static String requestMethod(String method, String url, String bodyContent,
+                                        Map<String, String> headers) throws IOException {
+        RequestBody body = RequestBody.create(MediaType.parse("charset=utf-8"), bodyContent);
+        Request request = new Request.Builder()
+                .url(url)
+                .headers(Headers.of(headers))
+                .method(method, body)
+                .build();
+        return getResponse(request);
+    }
+
+    private static String getResponse(Request request) throws IOException {
+        OkHttpClient client = getHttpClient();
+        try (Response response = client.newCall(request).execute()) {
+            if (response == null) {
+                return null;
             }
+            return response.body() == null ? response.toString() : response.body().string();
         }
     }
+
 }

src/main/java/com/datarangers/sdk/util/DslSign.java

@@ -52,7 +52,7 @@ private static String formatKeyValue(String key, String value) {
 
     private static String canonicalParam(Map<String, String> params) {
         String res = "CanonicalQueryString:";
-        if (params == null) {
+        if (params == null || params.isEmpty()) {
             return res;
         }
         for (String key : params.keySet()) {