From 0b74d92a5935043f785985a4acba4af8ea6f6991 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 26 Feb 2021 11:00:10 +0800
Subject: [PATCH] =?UTF-8?q?HttpClientManager=20header=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAobject?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/jcet/JcetApiService.java          |  7 ++++---
 .../commons/tools/utils/HttpClientManager.java   | 16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
index 5dbe5bdce0..c2e631ae16 100644
--- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
+++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
@@ -38,6 +38,7 @@ public class JcetApiService extends AbstractApiService {
      * @author wxz
      * @date 2021.01.19 10:26
      */
+    @Override
     public ThirdPlatUserInfo getCUserInfoByTicket(String ticket) throws UnsupportedEncodingException {
 
         logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>");
@@ -132,11 +133,11 @@ public class JcetApiService extends AbstractApiService {
      * @return
      * @throws UnsupportedEncodingException
      */
-    private Map<String, String> getHeaders(int bodyLength, String appKey, String appSecret) throws UnsupportedEncodingException {
+    private Map<String, Object> getHeaders(int bodyLength, String appKey, String appSecret) throws UnsupportedEncodingException {
 
-        Map<String, String> headers = new HashMap();
+        Map<String, Object> headers = new HashMap();
         long timestamp = System.currentTimeMillis();
-        headers.put(JcetConstants.PLAT_HEADER_OPEN_TIMESTAMP, String.valueOf(timestamp));
+        headers.put(JcetConstants.PLAT_HEADER_OPEN_TIMESTAMP, timestamp);
         headers.put(JcetConstants.PLAT_HEADER_OPEN_APP_ID, appKey);
         String encryptContent = appKey + timestamp + bodyLength;
         headers.put(JcetConstants.PLAT_HEADER_OPEN_SIGN, SignUtils.generate(encryptContent, appSecret));
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
index 0c83bfdede..463e0b4c6d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
@@ -188,15 +188,17 @@ public class HttpClientManager {
 
 	}
 
-	public Result<String> sendPost(String url, boolean isHttps, String jsonStrParam,Map<String,String> headerMap) {
+	public Result<String> sendPost(String url, boolean isHttps, String jsonStrParam, Map<String, Object> headerMap) {
 
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
 			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
-			if (null != headerMap){
-				headerMap.forEach((k,v) -> {
-					httppost.addHeader(k,v);
+			if (null != headerMap) {
+				headerMap.forEach((k, v) -> {
+					if (StringUtils.isNotBlank(k)) {
+						httppost.addHeader(k, v == null ? null : v.toString());
+					}
 				});
 			}
 			if (StringUtils.isNotEmpty(jsonStrParam)) {
@@ -348,7 +350,7 @@ public class HttpClientManager {
 		}
 	}
 
-	public Result<String> sendGet(String url, boolean isHttps, Map<String, Object> params, Map<String,String> headerMap) {
+	public Result<String> sendGet(String url, boolean isHttps, Map<String, Object> params, Map<String, Object> headerMap) {
 
 		try {
 			URIBuilder builder = new URIBuilder(url);
@@ -363,7 +365,9 @@ public class HttpClientManager {
 			httpGet.setConfig(requestConfig);
 			if (null != headerMap){
 				headerMap.forEach((k,v) -> {
-					httpGet.addHeader(k,v);
+					if (StringUtils.isNotBlank(k)) {
+						httpGet.addHeader(k, v == null ? null : v.toString());
+					}
 				});
 			}
 			return execute(httpGet, isHttps);