From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +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 |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 9321192..ab88f05 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
@@ -13,10 +13,10 @@
 import com.java110.core.log.LoggerFactory;
 import com.java110.core.smo.ISaveTransactionLogSMO;
 import com.java110.core.trace.Java110TraceLog;
-import com.java110.entity.center.AppRoute;
-import com.java110.entity.center.AppService;
-import com.java110.entity.center.DataFlowLinksCost;
-import com.java110.po.transactionLog.TransactionLogPo;
+import com.java110.dto.system.AppRoute;
+import com.java110.dto.system.AppService;
+import com.java110.dto.system.DataFlowLinksCost;
+import com.java110.po.log.TransactionLogPo;
 import com.java110.utils.cache.AppRouteCache;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.*;
@@ -99,12 +99,16 @@
             responseEntity = dataFlow.getResponseEntity();
 
         } catch (DecryptException e) { //瑙e瘑寮傚父
+            logger.error("鍐呴儴寮傚父锛�", e);
             responseEntity = ResultVo.error("瑙e瘑寮傚父锛�" + e.getMessage());
         } catch (BusinessException e) {
+            logger.error("鍐呴儴寮傚父锛�", e);
             responseEntity = ResultVo.error(e.getMessage());
         } catch (NoAuthorityException e) {
+            logger.error("鍐呴儴寮傚父锛�", e);
             responseEntity = ResultVo.error("閴存潈澶辫触锛�" + e.getMessage());
         } catch (InitConfigDataException e) {
+            logger.error("鍐呴儴寮傚父锛�", e);
             responseEntity = ResultVo.error("鍒濆鍖栧け璐ワ細" + e.getMessage());
         } catch (Exception e) {
             logger.error("鍐呴儴寮傚父锛�", e);
@@ -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)
@@ -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