From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
index eef207a..98c287c 100755
--- a/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
@@ -99,16 +99,20 @@
responseEntity = dataFlow.getResponseEntity();
} catch (DecryptException e) { //瑙ｅ瘑寮傚父
- responseEntity = ResultVo.error("瑙ｅ瘑寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ logger.error("鍐呴儴寮傚父锛�", e);
+ responseEntity = ResultVo.error("瑙ｅ瘑寮傚父锛�" + e.getMessage());
} catch (BusinessException e) {
- responseEntity = ResultVo.error(e.getMessage(), HttpStatus.BAD_REQUEST);
+ logger.error("鍐呴儴寮傚父锛�", e);
+ responseEntity = ResultVo.error(e.getMessage());
} catch (NoAuthorityException e) {
- responseEntity = ResultVo.error("閴存潈澶辫触锛�" + e.getMessage(), HttpStatus.UNAUTHORIZED);
+ logger.error("鍐呴儴寮傚父锛�", e);
+ responseEntity = ResultVo.error("閴存潈澶辫触锛�" + e.getMessage());
} catch (InitConfigDataException e) {
- responseEntity = ResultVo.error("鍒濆鍖栧け璐ワ細" + e.getMessage(), HttpStatus.BAD_REQUEST);
+ logger.error("鍐呴儴寮傚父锛�", e);
+ responseEntity = ResultVo.error("鍒濆鍖栧け璐ワ細" + e.getMessage());
} catch (Exception e) {
logger.error("鍐呴儴寮傚父锛�", e);
- responseEntity = ResultVo.error("鍐呴儴寮傚父锛�" + e.getMessage() + e.getLocalizedMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ responseEntity = ResultVo.error("鍐呴儴寮傚父锛�" + e.getMessage() + e.getLocalizedMessage());
} finally {
Date endDate = DateUtil.getCurrentDate();
if (dataFlow != null) {
@@ -144,7 +148,7 @@
String serviceCode = dataFlow.getRequestHeaders().get(CommonConstant.HTTP_SERVICE);
- String logServiceCode = MappingCache.getValue(MappingCache.LOG_SERVICE_CODE);
+ String logServiceCode = MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH,MappingCache.LOG_SERVICE_CODE);
//鏃ュ織鏌ヨ涓嶈褰�
if ("/transactionLog/queryTransactionLog".equals(serviceCode)
@@ -156,7 +160,7 @@
return;
}
- if (StringUtil.isEmpty(logServiceCode)) {
+ if (StringUtil.isEmpty(logServiceCode) || "OFF".equals(logServiceCode.toUpperCase())) {
return;
}
if (logServiceCode.contains("|")) {
@@ -406,7 +410,7 @@
private void saveLogMessage(String requestJson, String responseJson) {
try {
- if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_LOG_ON_OFF))) {
+ if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH,MappingConstant.KEY_LOG_ON_OFF))) {
JSONObject log = new JSONObject();
log.put("request", requestJson);
log.put("response", responseJson);
@@ -424,7 +428,7 @@
*/
private void saveCostTimeLogMessage(DataFlow dataFlow) {
try {
- if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))) {
+ if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH,MappingConstant.KEY_COST_TIME_ON_OFF))) {
List<DataFlowLinksCost> dataFlowLinksCosts = dataFlow.getLinksCostDates();
JSONObject costDate = new JSONObject();
JSONArray costDates = new JSONArray();
--
Gitblit v1.8.0