fix: 更新获取人员信息任务

guzijian
1 parent c0a67eee
Showing 8 changed files with 158 additions and 483 deletions
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/config/RestTemplateConfig.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/PersonnelRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/java/com/ruoyi/utils/HttpUtils.java
@@ -16,7 +16,11 @@
     </description>
     <dependencies>
-
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.12</version>
+        </dependency>
         <!-- spring-boot-devtools -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -3,6 +3,23 @@ package com.ruoyi.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.ssl.TrustStrategy;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RestTemplate;
+
+import javax.net.ssl.SSLContext;
 /**
  * @author 20412
@@ -11,6 +28,23 @@ import org.springframework.web.client.RestTemplate;
 public class RestTemplateConfig {
     @Bean
     public RestTemplate getRestTemplate(){
-        return new RestTemplate();
+        RestTemplate restTemplate = null;
+        try {
+            TrustStrategy acceptingTrustStrategy = (chain, authType) -> true;
+            SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
+            SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+
+            HttpClientBuilder clientBuilder = HttpClients.custom();
+
+            CloseableHttpClient httpClient = clientBuilder.setSSLSocketFactory(sslsf).build();
+
+            HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+            requestFactory.setHttpClient(httpClient);
+
+            restTemplate = new RestTemplate(requestFactory);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return restTemplate;
     }
 }
@@ -7,6 +7,7 @@ import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
+import cn.hutool.http.HttpUtil;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -22,7 +23,6 @@ import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
-import com.ruoyi.utils.HttpUtils;
 import com.ruoyi.utils.ListUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.tomcat.util.buf.StringUtils;
@@ -325,7 +325,7 @@ public class DriverServiceImpl implements IDriverService {
         }
         log.debug("图片开始上传");
         // 获取图片数据
-        InputStream is = HttpUtils.doGet(url, new HashMap<>());
+        InputStream is = HttpUtil.createGet(url).execute().bodyStream();
         // 上传图片
         ThreadJobService.uploadImage(is, filePath);
         log.debug("图片上传完毕");
@@ -126,8 +126,10 @@ public class SignInServiceImpl implements ISignInService {
                 return result;
             }
         }
-
-        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(), vo);
+        if (SIGN_IN_FAIL.equals(signIn.getStatus())){
+            return AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(), vo);
+        }
+        return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
     }
     /**
@@ -218,7 +220,7 @@ public class SignInServiceImpl implements ISignInService {
             count = redisCache.setIncrementMapValue(key, signIn.getJobCode(), 1);
         }
         if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
-            return AjaxResult.warn(SIGN_IN_ERROR + signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员", vo);
+            return AjaxResult.warn(SIGN_IN_ERROR + ": "+ signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员。", vo);
         }
         return null;
     }
 package com.ruoyi.job;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -11,8 +12,6 @@ import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.pojo.response.personnel.*;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
-import com.ruoyi.utils.HttpUtils;
-import com.ruoyi.utils.ListUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,9 +100,7 @@ public class DriverJob implements InitializingBean {
             //获取token
             TokenResponseVo tokenVo = getToken(TOKEN_URL);
             // 获取驾驶员信息
-            List<Driver> drivers = getDrivers(tokenVo.getAccessToken());
-            //  插入信息
-            saveDrivers(drivers, tokenVo.getAccessToken());
+            getDrivers(tokenVo.getAccessToken());
         } catch (Exception e) {
             log.info("执行失败：" + e.getMessage());
@@ -111,14 +108,10 @@ public class DriverJob implements InitializingBean {
         log.info("执行结束");
     }
-    private void saveDrivers(List<Driver> drivers, String accessToken) {
-        // 获取图片
-        List<List<Driver>> list = ListUtils.splitList(drivers, 800);
-        for (List<Driver> driverList : list) {
-            // 多线程插入数据
-            THREAD_JOB_SERVICE.asyncUploadDriverWithUpdateImageUrl(driverList, accessToken);
-            log.info("开始插入");
-        }
+    private static void saveDrivers(List<Driver> drivers, String accessToken) {
+        // 多线程插入数据
+        log.info("开始插入");
+        THREAD_JOB_SERVICE.asyncUploadDriverWithUpdateImageUrl(drivers, accessToken);
 //        String downloadImage = getDownloadImage(url, accessToken, "");
     }
@@ -139,6 +132,7 @@ public class DriverJob implements InitializingBean {
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e);
         }
+        url = url + "?userId=InterfaceManagement&timeout=7200000&fileUrl=" + fileUrl + "&systemToken=16A66291CHE9K5DPE1IDO9E63FOE2VWA09QFLV";
         Map<String, Object> param = new HashMap<>();
         param.put("userId", "InterfaceManagement");
         param.put("timeout", 7200000L);
@@ -148,17 +142,15 @@ public class DriverJob implements InitializingBean {
         header.put("x-acs-dingtalk-access-token", accessToken);
         header.put("Content-Type", "application/json");
         String result = "";
-
         try {
-            String s = HttpUtils.doGet(url, param, header);
-            ImageUrlResultResponseVo vo = JSON.parseObject(s, ImageUrlResultResponseVo.class);
-            result = vo.getResult();
+            String body = HttpUtil.createGet(url).addHeaders(header).form(new HashMap<>()).execute().body();
+            result = JSON.parseObject(body, ImageUrlResultResponseVo.class).getResult();
             // 可能需要重新获取token
         } catch (Exception e) {
             String token = DriverJob.getToken(TOKEN_URL).getAccessToken();
             header.put("x-acs-dingtalk-access-token", token);
-            String s = HttpUtils.doGet(url, param, header);
-            ImageUrlResultResponseVo vo = JSON.parseObject(s, ImageUrlResultResponseVo.class);
+            String body = HttpUtil.createGet(url).addHeaders(header).form(new HashMap<>()).execute().body();
+            ImageUrlResultResponseVo vo = JSON.parseObject(body, ImageUrlResultResponseVo.class);
             result = vo.getResult();
         }
         return result;
@@ -223,35 +215,53 @@ public class DriverJob implements InitializingBean {
         return driverSchedulingMap;
     }
-    public static List<Driver> getDrivers(String accessToken) throws Exception {
+    public static void getDrivers(String accessToken) throws Exception {
 //        Map<String, String> configMap = getStringStringMap(timestamp);
 //        String sign = getSHA1(configMap);
         Date date = new Date();
-        PersonnelResultResponseVo vo = getPersonInfo(accessToken);
-        return vo.getData().stream().map(item -> {
+        int pageSize = 100;
+        PersonnelResultResponseVo vo = getPersonInfo(accessToken, pageSize, 1);
+        int countPage = vo.getTotalCount() / pageSize;
+        countPage = vo.getTotalCount() % pageSize == 0 ? countPage : countPage + 1;
+        List<Driver> drivers = getDrivers(date, vo);
+        saveDrivers(drivers, accessToken);
+        for (int i = 1; i <= countPage; ) {
+            if (++i <= countPage) {
+                vo = getPersonInfo(accessToken, 100, i);
+                drivers = getDrivers(date, vo);
+                saveDrivers(drivers, accessToken);
+            }
+        }
+
+//        return drivers;
+    }
+
+    private static List<Driver> getDrivers(Date date, PersonnelResultResponseVo vo) {
+        List<Driver> drivers = vo.getData().stream().map(item -> {
             Driver driver = new Driver();
             FormData formData = item.getFormData();
             driver.setUpdateTime(date);
             driver.setJobCode(formData.getTextField_lk9mk222());
             driver.setPersonnelName(formData.getTextField_lk9mk224());
             driver.setPosts(formData.getTextField_lk9mk226());
-//            driver.setImage(form);
             // 解析JSON字符串
             List<ImageField_lk9mk228> lists = JSONArray.parseArray(formData.getImageField_lk9mk228(), ImageField_lk9mk228.class);
             driver.setImage(lists.get(0).getPreviewUrl());
             return driver;
         }).collect(Collectors.toList());
-//        return drivers;
+        return drivers;
     }
-    private static PersonnelResultResponseVo getPersonInfo(String accessToken) {
+    private static PersonnelResultResponseVo getPersonInfo(String accessToken, Integer pageSize, Integer currentPage) {
         RestTemplate restTemplate = new RestTemplate();
         String url = "https://api.dingtalk.com/v1.0/yida/forms/instances/search";
         PersonnelRequestVo vo = new PersonnelRequestVo();
         vo.setAppType("APP_HV8J7X8PFRXLJJW8JTZK");
-        vo.setFormUuid("FORM-CP766081XRMCZBZC7URI45AVVB662XFNMKAKLB");
+        vo.setFormUuid("FORM-D2B665D1LQMCRRGS9WE6F54QTVYF25BXHM9KL4");
         vo.setUserId("InterfaceManagement");
         vo.setSystemToken("16A66291CHE9K5DPE1IDO9E63FOE2VWA09QFLV");
+        vo.setCurrentPage(currentPage);
+        vo.setPageSize(pageSize);
         // 工号组件
 //        vo.setSearchFieldJson(" size = 4");
         // 设置请求头
@@ -12,4 +12,12 @@ public class PersonnelRequestVo {
      *     非必须
      */
     String searchFieldJson;
+    /**
+     * 非必须
+     */
+    Integer currentPage;
+    /**
+     * 非必须
+     */
+    Integer pageSize;
 }
 package com.ruoyi.service;
+import cn.hutool.http.HttpUtil;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.exception.file.FileUploadException;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.common.utils.uuid.Seq;
-import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.job.DriverJob;
-import com.ruoyi.utils.HttpUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.web.client.RestTemplate;
 import sun.misc.BASE64Decoder;
 import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Base64;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -46,9 +40,15 @@ public class ThreadJobService {
     @Autowired
     private DriverMapper driverMapper;
+    @Autowired
+    private PlatformTransactionManager transactionManager;
+
     @Value("${api.headImage}")
     private String headImagePre;
+    @Autowired
+    private RestTemplate restTemplate;
+
     /**
      * 异步上传图片
@@ -104,46 +104,75 @@ public class ThreadJobService {
     public void asyncUploadDriverWithUpdateImageUrl(List<Driver> drivers, String token) {
         // 插入数据
         for (Driver driver : drivers) {
-            String imageUlr = driver.getImage();
-            // 生成文件路径
-            String fileName = driver.getJobCode() + ".png";
-            String filePath = RuoYiConfig.getUploadPath() + headImagePre + "/" + fileName;
+            // 开启事务
+            TransactionStatus transaction = transactionManager.getTransaction(new DefaultTransactionDefinition());
             try {
-                fileName = FileUploadUtils.getPathFileName(RuoYiConfig.getUploadPath() + headImagePre, fileName);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
+                // 插入数据
+                insertDriverInfo(token, driver);
+                // 提交事务
+                transactionManager.commit(transaction);
+            } catch (Exception e) {
+                // 回滚事务
+                transactionManager.rollback(transaction);
+                log.error("保存数据是出现了异常:{}",e.getMessage());
             }
-            driver.setImage(fileName);
-            // 插入数据  如果员工已经存在在不在下载图片
-            int result = driverMapper.insertDriver(driver);
-            log.debug("插入完毕");
-            if (result == 0) {
-                continue;
-            }
-            log.info("图片开始上传");
-            // 获取图片请求地址
-            String imageUrl = DriverJob.getDownloadImageUrl(token, imageUlr);
-            // 获取图片数据
-            InputStream is = HttpUtils.doGet(imageUrl, new HashMap<>());
-            // 上传图片
+        }
+
+
+    }
+
+    private void insertDriverInfo(String token, Driver driver) {
+        String headImageUrl = new String(driver.getImage());
+        // 生成文件路径
+        String fileName = driver.getJobCode() + ".png";
+        String filePath = RuoYiConfig.getUploadPath() + headImagePre + "/" + fileName;
+        try {
+            fileName = FileUploadUtils.getPathFileName(RuoYiConfig.getUploadPath() + headImagePre, fileName);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        driver.setImage(fileName);
+        // 插入数据  如果员工已经存在在不在下载图片
+        String imageUrl = DriverJob.getDownloadImageUrl(token, headImageUrl);
+        // 获取图片请求地址
+        if (StringUtils.isEmpty(imageUrl)) {
+            log.error("工号：{},图片缺失,放弃保存员工信息，等待员工图片手动上传。", driver.getJobCode());
+            return;
+        }
+        int result = driverMapper.insertDriver(driver);
+        log.debug("插入完毕");
+        if (result == 0) {
+            return;
+        }
+        log.info("图片开始上传");
+        // 获取图片数据
+        InputStream is = getImageInputStreamByUrl(imageUrl);
+        // 上传图片
+        try {
+            uploadImage(is, filePath);
+        } catch (IOException e) {
+            log.error("工号：{}的人脸图像，上传失败:{}" , driver.getJobCode(), e.getMessage());
+            is = getImageInputStreamByUrl(imageUrl);
             try {
                 uploadImage(is, filePath);
-            } catch (IOException e) {
-                log.error(e.getMessage());
-                throw new RuntimeException(e);
+            } catch (IOException ex) {
+                log.error("工号：{}的人脸图像，再次上传失败:{}" , driver.getJobCode(), e.getMessage());
+                throw new RuntimeException(ex);
             }
-            log.debug("图片上传完毕");
         }
+        log.info("图片上传完毕");
+    }
-
+    private InputStream getImageInputStreamByUrl(String imageUrl) {
+        return HttpUtil.createGet(imageUrl).execute().bodyStream();
     }
     public static void uploadImage(InputStream is, String filePath) throws IOException {
-        if (Objects.isNull(is)){
+        if (Objects.isNull(is)) {
             throw new IOException("图片数据不存在");
         }
         File file = new File(filePath + File.separator);
-        log.info("文件路径:{}",file.getPath());
+        log.info("文件路径:{}", file.getPath());
         if (!file.exists()) {
             if (!file.getParentFile().exists()) {
                 file.getParentFile().mkdirs();
-package com.ruoyi.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustStrategy;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.*;
-
-@Slf4j
-public class HttpUtils {
-    private static PoolingHttpClientConnectionManager connMgr;
-    private static RequestConfig requestConfig;
-    private static final int MAX_TIMEOUT = 10000;
-
-    private static final Logger logger = LoggerFactory.getLogger(HttpUtils.class);
-
-    static {
-        // 设置连接池
-        connMgr = new PoolingHttpClientConnectionManager();
-        // 设置连接池大小
-        connMgr.setMaxTotal(20);
-        connMgr.setDefaultMaxPerRoute(connMgr.getMaxTotal());
-        // Validate connections after 1 sec of inactivity
-        connMgr.setValidateAfterInactivity(5000);
-        RequestConfig.Builder configBuilder = RequestConfig.custom();
-        // 设置连接超时
-        configBuilder.setConnectTimeout(MAX_TIMEOUT);
-        // 设置读取超时
-        configBuilder.setSocketTimeout(MAX_TIMEOUT);
-        // 设置从连接池获取连接实例的超时
-        configBuilder.setConnectionRequestTimeout(MAX_TIMEOUT);
-
-        requestConfig = configBuilder.build();
-    }
-
-    /**
-     * 发送 GET 请求（HTTP），不带输入数据
-     *
-     * @param url
-     * @return
-     */
-    public static String doGet(String url) {
-        return doGet(url, new HashMap<String, Object>(), new HashMap<>());
-    }
-
-    /**
-     * 发送 GET 请求（HTTP），K-V形式
-     *
-     * @param url
-     * @param params
-     * @return
-     */
-    public static String doGet(String url, Map<String, Object> params, Map<String, String> headers) {
-        String apiUrl = url;
-        StringBuffer param = new StringBuffer();
-        int i = 0;
-        for (String key : params.keySet()) {
-            if (i == 0)
-                param.append("?");
-            else
-                param.append("&");
-            param.append(key).append("=").append(params.get(key));
-            i++;
-        }
-        apiUrl += param;
-        String result = null;
-        CloseableHttpClient httpClient = null;
-        if (apiUrl.startsWith("https")) {
-            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
-                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
-        } else {
-            httpClient = HttpClients.createDefault();
-        }
-        HttpResponse response = null;
-        try {
-            log.info("HttpUrl:{}",apiUrl);
-            HttpGet httpGet = new HttpGet(apiUrl);
-            httpGet.setConfig(requestConfig);
-            for (Map.Entry<String, String> header : headers.entrySet()) {
-                httpGet.addHeader(header.getKey(), header.getValue());
-            }
-            response = httpClient.execute(httpGet);
-            HttpEntity entity = response.getEntity();
-            if (entity != null) {
-                InputStream instream = entity.getContent();
-                result = IOUtils.toString(instream, "UTF-8");
-                logger.info("Http Result:{}",result);
-            }
-        } catch (IOException e) {
-            logger.error("Http Error:{}",e.getMessage());
-            try {
-                if (httpClient != null) {
-                    httpClient.close();
-                }
-                if (response != null) {
-                    EntityUtils.consume(response.getEntity());
-                }
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
-        }
-        return result;
-    }
-
-    public static InputStream doGet(String url,Map<String, Object> params) {
-        HashMap<String, String> headers = new HashMap<>();
-        String apiUrl = url;
-        StringBuffer param = new StringBuffer();
-        int i = 0;
-        for (String key : params.keySet()) {
-            if (i == 0)
-                param.append("?");
-            else
-                param.append("&");
-            param.append(key).append("=").append(params.get(key));
-            i++;
-        }
-        apiUrl += param;
-        InputStream result = null;
-        CloseableHttpClient httpClient = null;
-        if (apiUrl.startsWith("https")) {
-            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
-                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
-        } else {
-            httpClient = HttpClients.createDefault();
-        }
-        HttpResponse response = null;
-        try {
-            log.info("HttpUrl:{}",apiUrl);
-            HttpGet httpGet = new HttpGet(apiUrl);
-            httpGet.setConfig(requestConfig);
-            for (Map.Entry<String, String> header : headers.entrySet()) {
-                httpGet.addHeader(header.getKey(), header.getValue());
-            }
-            response = httpClient.execute(httpGet);
-            HttpEntity entity = response.getEntity();
-            if (entity != null) {
-                result = entity.getContent();
-                logger.info("Http Result:{}",result);
-            }
-        } catch (IOException e) {
-            logger.error("Http Error:{}",e.getMessage());
-            try {
-                if (httpClient != null) {
-                    httpClient.close();
-                }
-                if (response != null) {
-                    EntityUtils.consume(response.getEntity());
-                }
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
-        }
-        return result;
-    }
-    /**
-     * 发送 GET 请求（HTTP），K-V形式--------取消重定向！！！！！！
-     *
-     * @param url
-     * @param params
-     * @return
-     */
-    public static HttpResponse doGetAndReturnResponse(String url, Map<String, Object> params, Map<String, String> headers) {
-        String apiUrl = url;
-        StringBuffer param = new StringBuffer();
-        int i = 0;
-        for (String key : params.keySet()) {
-            if (i == 0)
-                param.append("?");
-            else
-                param.append("&");
-            param.append(key).append("=").append(params.get(key));
-            i++;
-        }
-        apiUrl += param;
-
-        CloseableHttpClient httpClient = null;
-        if (apiUrl.startsWith("https")) {
-            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
-                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
-        } else {
-            httpClient = HttpClients.createDefault();
-        }
-        CloseableHttpResponse response = null;
-        try {
-            HttpGet httpGet = new HttpGet(apiUrl);
-            httpGet.setConfig(requestConfig);
-
-            //取消强制重定向！！！！！
-            httpGet.setConfig(RequestConfig.custom().setRedirectsEnabled(false).build());
-
-
-            for (Map.Entry<String, String> header : headers.entrySet()) {
-                httpGet.addHeader(header.getKey(), header.getValue());
-            }
-            response = httpClient.execute(httpGet);
-
-            return response;
-        } catch (IOException e) {
-            try {
-                if (httpClient != null) {
-                    httpClient.close();
-                }
-                if (response != null) {
-                    EntityUtils.consume(response.getEntity());
-                }
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * 发送 POST 请求（HTTP），不带输入数据
-     *
-     * @param apiUrl
-     * @return
-     */
-    public static String doPost(String apiUrl) {
-        return doPost(apiUrl, "", new HashMap<>());
-    }
-
-    /**
-     * 发送 POST 请求，K-V形式
-     *
-     * @param apiUrl API接口URL
-     * @return
-     */
-    public static String doPost(String apiUrl, String paramStr, Map<String, String> headers) {
-        CloseableHttpClient httpClient = null;
-        if (apiUrl.startsWith("https")) {
-            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
-                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
-        } else {
-            httpClient = HttpClients.createDefault();
-        }
-        String httpStr = null;
-        HttpPost httpPost = new HttpPost(apiUrl);
-        CloseableHttpResponse response = null;
-
-        try {
-            httpPost.setConfig(requestConfig);
-            if(CollectionUtils.isNotEmpty(headers.entrySet())){
-                for (Map.Entry<String, String> header : headers.entrySet()) {
-                    httpPost.addHeader(header.getKey(), header.getValue());
-                }
-            }
-            httpPost.setEntity(new StringEntity(paramStr));
-            response = httpClient.execute(httpPost);
-            HttpEntity entity = response.getEntity();
-            httpStr = EntityUtils.toString(entity, "UTF-8");
-        } catch (IOException e) {
-            log.error("Http调用异常：{}",e.getMessage());
-            e.printStackTrace();
-        } finally {
-            try {
-                if (httpClient != null) {
-                    httpClient.close();
-                }
-                if (response != null) {
-                    EntityUtils.consume(response.getEntity());
-                }
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
-        }
-        return httpStr;
-    }
-
-    public static HttpResponse doPostAndReturnResponse(String apiUrl, Map<String, String> params, Map<String, String> headers) {
-        CloseableHttpClient httpClient = null;
-        if (apiUrl.startsWith("https")) {
-            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
-                    .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
-        } else {
-            httpClient = HttpClients.createDefault();
-        }
-        HttpPost httpPost = new HttpPost(apiUrl);
-        CloseableHttpResponse response = null;
-
-        try {
-            httpPost.setConfig(requestConfig);
-            for (Map.Entry<String, String> header : headers.entrySet()) {
-                httpPost.addHeader(header.getKey(), header.getValue());
-            }
-            //组织请求参数
-            List<NameValuePair> paramList = new ArrayList<NameValuePair>();
-            if (params != null && params.size() > 0) {
-                Set<String> keySet = params.keySet();
-                for (String key : keySet) {
-                    paramList.add(new BasicNameValuePair(key, params.get(key)));
-                }
-            }
-            httpPost.setEntity(new UrlEncodedFormEntity(paramList, "UTF-8"));
-            response = httpClient.execute(httpPost);
-            return response;
-        } catch (IOException e) {
-            log.error("发送Http Post异常：{}", e);
-        } finally {
-            try {
-                if (httpClient != null) {
-                //    httpClient.close();
-                }
-                if (response != null) {
-                    EntityUtils.consume(response.getEntity());
-                }
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 发送 POST 请求，JSON形式，接收端需要支持json形式，否则取不到数据
-     *
-     * @param apiUrl
-     * @param json   json对象
-     * @return
-     */
-    public static String doPost(String apiUrl, String json) {
-        CloseableHttpClient httpClient = null;
-        if (apiUrl.startsWith("https")) {
-            httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory()).setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
-        } else {
-            httpClient = HttpClients.createDefault();
-        }
-        String httpStr = null;
-        HttpPost httpPost = new HttpPost(apiUrl);
-        CloseableHttpResponse response = null;
-
-        try {
-            httpPost.setConfig(requestConfig);
-            StringEntity stringEntity = new StringEntity(json, "UTF-8");// 解决中文乱码问题
-            stringEntity.setContentEncoding("UTF-8");
-            stringEntity.setContentType("application/json");
-            httpPost.setEntity(stringEntity);
-            response = httpClient.execute(httpPost);
-            HttpEntity entity = response.getEntity();
-            httpStr = EntityUtils.toString(entity, "UTF-8");
-        } catch (IOException e) {
-            log.error("发送Http Post异常：{}}", e);
-        } finally {
-            try {
-                if (response != null) {
-                    EntityUtils.consume(response.getEntity());
-                }
-            } catch (IOException exception) {
-                exception.printStackTrace();
-            }
-        }
-        return httpStr;
-    }
-
-    /**
-     * 创建SSL安全连接
-     *
-     * @return
-     */
-    private static SSLConnectionSocketFactory createSSLConnSocketFactory() {
-        SSLConnectionSocketFactory sslsf = null;
-        try {
-            SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
-
-                public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-                    return true;
-                }
-            }).build();
-            sslsf = new SSLConnectionSocketFactory(sslContext, new HostnameVerifier() {
-
-                @Override
-                public boolean verify(String arg0, SSLSession arg1) {
-                    return true;
-                }
-            });
-        } catch (GeneralSecurityException e) {
-            e.printStackTrace();
-        }
-        return sslsf;
-    }
-
-
-}