From e5e85313b79e3fb208c1940bbf88f38d92c2ee80 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Wed, 7 Mar 2018 19:51:03 +0800
Subject: [PATCH] merge

---
 .../com/xwbing/util/{HttpClientUtil.java => HttpUtil.java}    | 4 ++--
 .../main/java/com/xwbing/controller/other/TestControl.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename boot-service/src/main/java/com/xwbing/util/{HttpClientUtil.java => HttpUtil.java} (98%)

diff --git a/boot-service/src/main/java/com/xwbing/util/HttpClientUtil.java b/boot-service/src/main/java/com/xwbing/util/HttpUtil.java
similarity index 98%
rename from boot-service/src/main/java/com/xwbing/util/HttpClientUtil.java
rename to boot-service/src/main/java/com/xwbing/util/HttpUtil.java
index 749961d..461971e 100644
--- a/boot-service/src/main/java/com/xwbing/util/HttpClientUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/HttpUtil.java
@@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit;
  * 作者: xiangwb
  * 说明: HttpClientUtil
  */
-public class HttpClientUtil {
-    private static Logger LOGGER = LoggerFactory.getLogger(HttpClientUtil.class);
+public class HttpUtil {
+    private static Logger LOGGER = LoggerFactory.getLogger(HttpUtil.class);
     private static PoolingHttpClientConnectionManager poolingHttpClientConnectionManager;
     private static final String APPLICATION_JSON = "application/json";
     private static final String FORM_URLENCODED = "application/x-www-form-urlencoded";
diff --git a/boot-web/src/main/java/com/xwbing/controller/other/TestControl.java b/boot-web/src/main/java/com/xwbing/controller/other/TestControl.java
index e8682a3..bf6fe38 100644
--- a/boot-web/src/main/java/com/xwbing/controller/other/TestControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/other/TestControl.java
@@ -8,7 +8,7 @@ import com.xwbing.redis.RedisService;
 import com.xwbing.service.other.CookieSessionService;
 import com.xwbing.service.other.ExpressDeliveryService;
 import com.xwbing.service.other.QRCodeZipService;
-import com.xwbing.util.HttpClientUtil;
+import com.xwbing.util.HttpUtil;
 import com.xwbing.util.JsonResult;
 import com.xwbing.util.RSAUtil;
 import com.xwbing.util.RestMessage;
@@ -119,7 +119,7 @@ public class TestControl {
 //        String url = "http://localhost:8080/user/listAll";
 //        return HttpClientUtil.get(url);
         String url = "http://localhost:8080/user/save";
-        return HttpClientUtil.postByJson(url, param);
+        return HttpUtil.postByJson(url, param);
     }
 
     @LogInfo("session")