设置连接池为okhttp

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java

@@ -2,7 +2,7 @@ package com.liquidnet.commons.lang.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.liquidnet.commons.lang.util.spring.RestTemplateConfig;
+import com.liquidnet.commons.lang.util.spring.RestTemplateOkConfig;
 import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -20,9 +20,9 @@ public class HttpUtil {
 
     static {
         //apache httpClient
-        restTemplate = RestTemplateConfig.getRestTemplate();
+//        restTemplate = RestTemplateConfig.getRestTemplate();
 //        //okhttp3 client
-//        restTemplate = RestTemplateOkConfig.getRestTemplate();
+        restTemplate = RestTemplateOkConfig.getRestTemplate();
     }
 
     /**
@@ -45,7 +45,7 @@ public class HttpUtil {
      * @return
      */
     public static String get(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
-        return request(url, params, headers, HttpMethod.GET);
+        return requestForGet(url, params, headers, HttpMethod.GET);
     }
 
     /**
@@ -252,6 +252,22 @@ public class HttpUtil {
         return request(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
     }
 
+    /**
+     * 表单请求
+     *
+     * @param url
+     * @param params  请求参数
+     * @param headers 请求头
+     * @param method  请求方式
+     * @return
+     */
+    public static String requestForGet(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
+        if (params == null) {
+            params = new LinkedMultiValueMap<>();
+        }
+        return requestForGet(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
+    }
+
     /**
      * http请求 通过uri
      * @param url
@@ -293,6 +309,37 @@ public class HttpUtil {
         return requestRaw(url, params, headers, method, MediaType.APPLICATION_JSON);
     }
 
+
+    /**
+     * http请求
+     *
+     * @param url
+     * @param params    请求参数
+     * @param headers   请求头
+     * @param method    请求方式
+     * @param mediaType 参数类型
+     * @return
+     */
+    public static String requestForGet(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
+        if (url == null || url.trim().isEmpty()) {
+            return null;
+        }
+
+        // header
+        HttpHeaders httpHeaders = new HttpHeaders();
+        if (headers != null) {
+            httpHeaders.addAll(headers);
+        }
+        HttpEntity<Object> httpEntity = new HttpEntity(httpHeaders);
+
+//        RestTemplate restTemplate = new RestTemplate();
+        // 提交方式：表单、json
+        ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
+        return response.getBody();
+    }
+
+
+
     /**
      * http请求
      *