From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 655beeb..ed3daf6 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
@@ -29,7 +29,7 @@
public class CallApiServiceFactory {
- private static final String URL_API = ServiceConstant.SERVICE_API_URL + "/api/";
+ private static final String URL_API = "";
//鏃ュ織
private static Logger logger = LoggerFactory.getLogger(CallApiServiceFactory.class);
@@ -204,6 +204,7 @@
return list;
}
+
public static ResponseEntity<String> callCenterService(RestTemplate restTemplate, IPageData pd, String param, String url, HttpMethod httpMethod) {
ResponseEntity<String> responseEntity = null;
long startTime = DateUtil.getCurrentDate().getTime();
@@ -212,13 +213,18 @@
if (pd.getHeaders() != null) {
for (String key : pd.getHeaders().keySet()
) {
+ if(CommonConstant.USER_ID.equals(key.toLowerCase())){
+ continue;
+ }
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.USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
+ header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), StringUtil.isEmpty(pd.getTransactionId())?GenerateCodeFactory.getUUID():pd.getTransactionId());
+ header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), StringUtil.isEmpty(pd.getRequestTime())?DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT):pd.getRequestTime());
header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
@@ -226,8 +232,10 @@
try {
responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
+ logger.error("璋冪敤涓績鏈嶅姟澶辫触",e);
responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
} catch (Exception e) {
+ logger.error("璋冪敤涓績鏈嶅姟澶辫触",e);
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, httpEntity, responseEntity);
@@ -235,7 +243,6 @@
}
return responseEntity;
}
-
/**
* map 鍙傛暟杞� url get 鍙傛暟 闈炵┖鍊艰浆涓篻et鍙傛暟 绌哄�煎拷鐣�
--
Gitblit v1.8.0