From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +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 | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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
old mode 100644
new mode 100755
index 9b98b3a..caea3c9
--- 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
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.IApiServiceSMO;
-import com.java110.api.smo.ISaveTransactionLogSMO;
+import com.java110.core.smo.ISaveTransactionLogSMO;
import com.java110.core.client.RestTemplate;
import com.java110.core.context.ApiDataFlow;
import com.java110.core.context.DataFlow;
@@ -38,7 +38,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -133,10 +132,8 @@
//娣诲姞鑰楁椂
saveLog(dataFlow, startDate, endDate, reqJson, responseEntity);
//杩欓噷淇濆瓨鑰楁椂锛屼互鍙婃棩蹇�
- return responseEntity;
-
}
-
+ return responseEntity;
}
/**
@@ -156,6 +153,16 @@
String logServiceCode = MappingCache.getValue(MappingCache.LOG_SERVICE_CODE);
+ //鏃ュ織鏌ヨ涓嶈褰�
+ if ("/transactionLog/queryTransactionLog".equals(serviceCode)
+ || "/transactionLog/queryTransactionLogMessage".equals(serviceCode)
+ || "file.getFile".equals(serviceCode)
+ || "file.getFileByObjId".equals(serviceCode)
+ || "/machine/heartbeat".equals(serviceCode) // 蹇冭烦涔熶笉璁板綍
+ ) {
+ return;
+ }
+
if (StringUtil.isEmpty(logServiceCode)) {
return;
}
--
Gitblit v1.8.0