From 09a2b97879cc645d55b4cc277594f28a1d7de629 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 19 五月 2021 12:29:33 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java b/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java
index 29083db..655beeb 100755
--- a/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java
@@ -209,17 +209,18 @@
long startTime = DateUtil.getCurrentDate().getTime();
logger.debug(url + "璋冪敤api寮�濮嬶細" + (startTime));
HttpHeaders header = new HttpHeaders();
- header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), StringUtil.isEmpty(pd.getAppId()) ? AppDto.WEB_APP_ID : pd.getAppId());
- header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
- header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
- header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
- header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
if (pd.getHeaders() != null) {
for (String key : pd.getHeaders().keySet()
) {
header.add(key, pd.getHeaders().get(key).toString());
}
}
+ header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), StringUtil.isEmpty(pd.getAppId()) ? AppDto.WEB_APP_ID : pd.getAppId());
+ header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
+ header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
+ header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
+ header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
+
HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
//logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}", httpEntity);
try {
--
Gitblit v1.8.0