From 75b60332f174363cfe67f61dea87832be708ac15 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:37:46 +0800
Subject: [PATCH] 更新部分接口

---
 cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
index 2237d7c..78738b7 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
@@ -1,6 +1,7 @@
 package com.dsh.account.util.httpClinet;
 
 import com.alibaba.fastjson.JSON;
+import com.dsh.account.util.httpClinet.HttpResult;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.config.RequestConfig;
@@ -19,7 +20,6 @@
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 
 import javax.net.ssl.SSLContext;
 import java.io.File;
@@ -34,15 +34,14 @@
 /**
  * http工具类
  */
-@Component
 public class HttpClientUtil {
 
     private static Logger logger = LoggerFactory.getLogger(HttpClientUtil.class);
 
-    private PoolingHttpClientConnectionManager connectionManager;
+    private static PoolingHttpClientConnectionManager connectionManager;
 
 
-    public HttpClientUtil(){
+    {
         //1.创建连接池管理器
         connectionManager = new PoolingHttpClientConnectionManager(60000,
                 TimeUnit.MILLISECONDS);
@@ -53,14 +52,14 @@
     /**
      * 创建一个httpClient对象
      */
-    private CloseableHttpClient getHttpCline(){
+    private static CloseableHttpClient getHttpCline(){
         return  HttpClients.custom()
                 .setConnectionManager(connectionManager)
                 .disableAutomaticRetries()
                 .build();
     }
 
-    private RequestConfig getRequestConfig(){
+    private static RequestConfig getRequestConfig(){
         RequestConfig.Builder builder = RequestConfig.custom();
         builder.setSocketTimeout(60000)//3.1设置客户端等待服务端返回数据的超时时间
                 .setConnectTimeout(30000)//3.2设置客户端发起TCP连接请求的超时时间
@@ -76,9 +75,9 @@
      * @param url       请求地址
      * @param params    请求参数
      */
-    private CloseableHttpResponse setPostHttpRequset(String url, Map<String, Object> params, Map<String, String> header, String contentType) throws Exception{
+    private static CloseableHttpResponse setPostHttpRequset(String url, Map<String, Object> params, Map<String, String> header, String contentType) throws Exception{
         HttpPost httpPost = new HttpPost(url);
-        httpPost.setConfig(this.getRequestConfig());
+        httpPost.setConfig(getRequestConfig());
         if(null != header){
             for(String key : header.keySet()){
                 httpPost.setHeader(key, header.get(key));
@@ -110,7 +109,7 @@
      * @param url       请求地址
      * @param params    请求参数
      */
-    private CloseableHttpResponse setGetHttpRequset(String url, Map<String, Object> params, Map<String, String> header) throws Exception{
+    private static CloseableHttpResponse setGetHttpRequset(String url, Map<String, Object> params, Map<String, String> header) throws Exception{
         StringBuffer sb = new StringBuffer();
         String p = "";
         if(null != params){
@@ -140,14 +139,14 @@
      * @param contentType   参数请求方式form/json
      * @return
      */
-    public HttpResult pushHttpRequset(String mothed, String url, Map<String, Object> params, Map<String, String> header, String contentType) throws Exception{
+    public static HttpResult pushHttpRequset(String mothed, String url, Map<String, Object> params, Map<String, String> header, String contentType) throws Exception{
         String randome = UUID.randomUUID().toString();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
         logger.info(sdf.format(new Date()) + "----(" + randome + ")请求参数:" + JSON.toJSONString(params));
         CloseableHttpResponse httpResponse = null;
         switch (mothed){
             case "GET":
-                httpResponse = this.setGetHttpRequset(url, params, header);
+                httpResponse = setGetHttpRequset(url, params, header);
                 break;
             case "POST":
                 httpResponse = setPostHttpRequset(url, params, header, contentType);
@@ -157,7 +156,7 @@
         String content = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
         logger.info(sdf.format(new Date()) + "----(" + randome + ")返回结果:" + content);
         HttpResult httpResult = HttpResult.getHttpResult(statusCode, content);
-        this.close(httpResponse);
+        close(httpResponse);
         return httpResult;
     }
 
@@ -169,7 +168,7 @@
      * @param header    自定义请求头
      * @return
      */
-    public HttpResult pushHttpRequsetXml(String url, String xml, Map<String, String> header) throws Exception{
+    public static HttpResult pushHttpRequsetXml(String url, String xml, Map<String, String> header) throws Exception{
         HttpPost httpPost = new HttpPost(url);
         httpPost.setConfig(getRequestConfig());
         for(String key : header.keySet()){
@@ -181,7 +180,7 @@
         int statusCode = httpResponse.getStatusLine().getStatusCode();
         String content = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
         HttpResult httpResult = HttpResult.getHttpResult(statusCode, content);
-        this.close(httpResponse);
+        close(httpResponse);
         return httpResult;
     }
 
@@ -246,7 +245,7 @@
     /**
      * 关闭资源
      */
-    private void close(CloseableHttpResponse httpResponse){
+    private static void close(CloseableHttpResponse httpResponse){
         try {
             if(null != httpResponse){
                 EntityUtils.consume(httpResponse.getEntity());//此处高能,通过源码分析,由EntityUtils是否回收HttpEntity

--
Gitblit v1.7.1