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

---
 .../src/main/java/com/xwbing/demo/demo.java     | 17 +----------------
 .../java/com/xwbing/util/HttpClientUtil.java    |  5 +++++
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/demo.java b/boot-service/src/main/java/com/xwbing/demo/demo.java
index b090664..401f1ac 100644
--- a/boot-service/src/main/java/com/xwbing/demo/demo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/demo.java
@@ -1,10 +1,5 @@
 package com.xwbing.demo;
 
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 项目名称: boot-module-demo
  * 创建时间: 2018/1/23 14:45
@@ -13,17 +8,7 @@ import java.util.Map;
  */
 public class demo {
     public static void main(String[] args) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("a","aa");
-        map.put("aaa","");
-        map.put("bbb",null);
-        System.out.println(map);
-
-        JSONObject jsonObject=new JSONObject();
-        jsonObject.put("a","aa");
-        jsonObject.put("aaa","");
-        jsonObject.put("bbb",null);
-        System.out.println(jsonObject);
+        System.out.println("你好");
 
     }
 }
diff --git a/boot-service/src/main/java/com/xwbing/util/HttpClientUtil.java b/boot-service/src/main/java/com/xwbing/util/HttpClientUtil.java
index fcfb0f8..1907025 100644
--- a/boot-service/src/main/java/com/xwbing/util/HttpClientUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/HttpClientUtil.java
@@ -37,6 +37,7 @@ public class HttpClientUtil {
     private static Logger LOGGER = LoggerFactory.getLogger(HttpClientUtil.class);
     private static PoolingHttpClientConnectionManager poolingHttpClientConnectionManager;
     private static final String APPLICATION_JSON = "application/json";
+    private static final String FORM_URLENCODED = "application/x-www-form-urlencoded";
     private static final String URL_ERROR = "Request Url can not be empty";
     private static final String PARAM_ERROR = "Request Params is null";
 
@@ -60,14 +61,17 @@ public class HttpClientUtil {
         }
         if (exception instanceof InterruptedIOException) {
             // Timeout
+            LOGGER.error("请求超时");
             return false;
         }
         if (exception instanceof UnknownHostException) {
             // Unknown host
+            LOGGER.error("未知主机");
             return false;
         }
         if (exception instanceof SSLException) {
             // SSL handshake exception
+            LOGGER.error("SSL连接失败");
             return false;
         }
         HttpClientContext clientContext = HttpClientContext.adapt(context);
@@ -127,6 +131,7 @@ public class HttpClientUtil {
         }
         try {
             post.setEntity(new UrlEncodedFormEntity(params, "UTF-8"));
+            post.setHeader("Content-Type", FORM_URLENCODED);
         } catch (UnsupportedEncodingException e) {
             LOGGER.error(e.getMessage());
             throw new UtilException("postByForm数据转换错误");