http工具类移到core中

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/tools/HttpClientUtil.java → gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/http/HttpClientUtil.java

@@ -1,8 +1,9 @@
-package cn.com.taiji.ias.tools;
+package cn.com.taiji.core.manager.tools.http;
 
 import okhttp3.*;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/clientConfig/WxManagerImpl.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +17,6 @@ import cn.com.taiji.ats.manager.tools.wx.WxSendRequestUtil;
 import cn.com.taiji.ats.model.protocol.channel.wx.dto.WxMiniSendMessageDto;
 import cn.com.taiji.ats.model.protocol.channel.wx.dto.WxMpSendMessageDto;
 import cn.com.taiji.ats.model.wx.WxUserInfoModel;
-import cn.com.taiji.ats.tools.HttpClientUtil;
 import cn.com.taiji.ats.tools.WxRequestAccessTokenUtil;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/handler/wx/WxMessageManagerImpl.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.List;
 
 import cn.com.taiji.common.pub.json.JsonTools;
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +17,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import cn.com.taiji.ats.api.TokenHelper;
 import cn.com.taiji.ats.manager.clientConfig.WxManager;
 import cn.com.taiji.ats.manager.tools.wx.WxRequestUrls;
-import cn.com.taiji.ats.tools.HttpClientUtil;
 import cn.com.taiji.ats.tools.WxRequestAccessTokenUtil;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/tools/wx/WxSendRequestUtil.java

@@ -3,6 +3,7 @@ package cn.com.taiji.ats.manager.tools.wx;
 import java.io.IOException;
 import java.util.Map;
 
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +15,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import cn.com.taiji.ats.manager.AbstractCommManager;
-import cn.com.taiji.ats.tools.HttpClientUtil;
 import cn.com.taiji.ats.tools.WxRequestAccessTokenUtil;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.pub.json.JsonTools;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/HttpClientUtil.java

@@ -1,63 +0,0 @@
-package cn.com.taiji.ats.tools;
-
-import okhttp3.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-public class HttpClientUtil {
-    private static final OkHttpClient client = new OkHttpClient.Builder()
-            .connectTimeout(20, TimeUnit.SECONDS)//连接超时
-            .readTimeout(30, TimeUnit.SECONDS)//读取响应超时
-            .writeTimeout(50, TimeUnit.SECONDS)//发送请求超时
-            .callTimeout(100, TimeUnit.SECONDS)// 整个调用过程超时
-            .build();
-    private static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
-    private static final MediaType FORM = MediaType.parse("application/x-www-form-urlencoded; charset=utf-8");
-    private static final String AUTHORIZATION = "Authorization";
-    private static final String BEARER = "Bearer ";
-
-        /**
-         * HTTP接口-POST方式，请求参数形式为body-json形式
-         */
-        public static String sendPost(String url, String jsonString, String token) throws IOException {
-            RequestBody body = RequestBody.create(JSON, jsonString);
-            Request.Builder builder = new Request.Builder()
-                    .post(body)
-                    .url(url);
-            // 仅当token非空时添加Authorization头
-            if (token != null && !token.trim().isEmpty()) {
-                builder.addHeader(AUTHORIZATION, BEARER + token);
-            }
-            Request request = builder.build();
-
-            try (Response response = client.newCall(request).execute()) {
-                if (!response.isSuccessful()){
-                    throw new IOException("Unexpected code: " + response);
-                }
-                return response.body().string();
-            } catch (IOException e) {
-                throw new IOException(e);
-            }
-        }
-
-        /**
-         * HTTP接口-GET方式，请求参数形式为params形式
-         */
-        public static String sendGet(String url) throws IOException {
-            Request request = new Request.Builder()
-                    .url(url)
-                    .build();
-            try (Response response = client.newCall(request).execute()) {
-                if (!response.isSuccessful()) {
-                    throw new IOException("Unexpected code " + response);
-                }
-                return response.body().string();
-            }
-        }
-
-}

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/WxRequestAccessTokenUtil.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/bill/BillBusinessManagerImpl.java

@@ -3,13 +3,13 @@ package cn.com.taiji.ias.manager.bill;
 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.json.JsonTools;
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.bill.*;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.ias.model.bill.InterfaceRequest;
 import cn.com.taiji.ias.model.bill.InterfaceResponse;
-import cn.com.taiji.ias.tools.HttpClientUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/bill/HltServiceImpl.java

@@ -1,11 +1,11 @@
 package cn.com.taiji.ias.manager.bill;
 
 import cn.com.taiji.common.pub.json.JsonTools;
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
 import cn.com.taiji.ias.model.bill.HltRequest;
 import cn.com.taiji.ias.model.bill.HltResponse;
 import cn.com.taiji.ias.model.bill.InterfaceRequest;
 import cn.com.taiji.ias.model.bill.InterfaceResponse;
-import cn.com.taiji.ias.tools.HttpClientUtil;
 import cn.com.taiji.ias.tools.NumberConvert;
 import cn.com.taiji.ias.tools.hlt.DesUtil;
 import org.springframework.beans.factory.annotation.Value;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/province/RefundHttpManagerImpl.java

@@ -2,6 +2,7 @@ package cn.com.taiji.ias.manager.province;
 
 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.pub.json.JsonTools;
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
 import cn.com.taiji.ias.config.RefundProperties;
 import cn.com.taiji.ias.manager.RedisWrapManager;
 import cn.com.taiji.ias.model.province.*;
@@ -9,7 +10,6 @@ import cn.com.taiji.ias.model.province.model.GetHandleRecordsModel;
 import cn.com.taiji.ias.model.province.model.OrderPushAsyncModel;
 import cn.com.taiji.ias.model.province.model.OrderSaveAsyncReqModel;
 import cn.com.taiji.ias.tools.HandlerUtils;
-import cn.com.taiji.ias.tools.HttpClientUtil;
 import cn.com.taiji.ias.tools.PasswordUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.google.common.collect.Maps;

zhywpt-service-ias/src/test/java/cn/com/taiji/oqs/client/province/TestProvinceHandler.java

@@ -7,7 +7,6 @@ import cn.com.taiji.core.model.comm.protocol.ias.province.model.OrderSaveReqMode
 import cn.com.taiji.ias.Application;
 import cn.com.taiji.ias.manager.AbstractCommManager;
 import cn.com.taiji.ias.manager.province.*;
-import cn.com.taiji.ias.tools.HttpClientUtil;
 import org.apache.commons.compress.utils.Lists;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;