From 95c907c9641122f706ee5fdf7a132ef1abe03c06 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 15 Jul 2025 19:14:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20sql=E7=9B=91?=
=?UTF-8?q?=E6=8E=A7=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1=E6=8C=87=E5=AE=9A?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8B=A6=E6=88=AA=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1460056485232640]sql监控增加统计指定接口拦截统计 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1460056485232640
---
.../threadlocal/RequestContext.java | 11 ++
.../dao/plugin/SqlCostInterceptor.java | 11 ++
.../dto/healthcheck/RequestSqlAuditVo.java | 137 ++++++++++++++++++
.../handler/AnonymousApiDispatcher.java | 4 +
.../dispatch/handler/ApiDispatcher.java | 4 +
.../dispatch/handler/PublicApiDispatcher.java | 3 +
6 files changed, 170 insertions(+)
create mode 100644 src/main/java/neatlogic/framework/dto/healthcheck/RequestSqlAuditVo.java
diff --git a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
index 84907aa3c..9e397a9e8 100644
--- a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
+++ b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
@@ -16,6 +16,7 @@ along with this program. If not, see .*/
package neatlogic.framework.asynchronization.threadlocal;
import neatlogic.framework.common.util.IpUtil;
+import neatlogic.framework.dto.healthcheck.RequestSqlAuditVo;
import neatlogic.framework.dto.healthcheck.SqlAuditVo;
import neatlogic.framework.restful.constvalue.RejectSource;
import org.apache.commons.lang3.StringUtils;
@@ -48,6 +49,8 @@ public class RequestContext implements Serializable {
//收集该请求执行的sql语句
private List sqlAuditList = Collections.synchronizedList(new ArrayList<>());
+ private RequestSqlAuditVo requestSqlAuditVo;
+
public String getUrl() {
return url;
}
@@ -122,6 +125,14 @@ public class RequestContext implements Serializable {
public void addSqlAudit(SqlAuditVo sqlAuditVo) {
sqlAuditList.add(sqlAuditVo);
+ if (requestSqlAuditVo == null) {
+ requestSqlAuditVo = new RequestSqlAuditVo();
+ }
+ requestSqlAuditVo.addSqlAudit(sqlAuditVo);
+ }
+
+ public RequestSqlAuditVo getRequestSqlAuditVo() {
+ return requestSqlAuditVo;
}
public static RequestContext init(RequestContext _requestContext) {
diff --git a/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java b/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java
index 7052d0e40..031148753 100644
--- a/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java
+++ b/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java
@@ -56,6 +56,7 @@ public class SqlCostInterceptor implements Interceptor {
public static class SqlIdMap {
private static final Set sqlSet = new HashSet<>();
+ private static final String URL_PREFIX = "/neatlogic/api/rest/";
public static void addId(String id) {
sqlSet.add(id);
@@ -80,6 +81,16 @@ public class SqlCostInterceptor implements Interceptor {
if (sqlSet.contains(id)) {
return true;
}
+ RequestContext requestContext = RequestContext.get();
+ if (requestContext != null && StringUtils.isNotBlank(requestContext.getUrl())) {
+ String url = requestContext.getUrl();
+ if (url.contains(URL_PREFIX)) {
+ url = url.substring(URL_PREFIX.length());
+ }
+ if (sqlSet.contains(url)) {
+ return true;
+ }
+ }
if (id.contains(".")) {
id = id.substring(id.lastIndexOf(".") + 1);
}
diff --git a/src/main/java/neatlogic/framework/dto/healthcheck/RequestSqlAuditVo.java b/src/main/java/neatlogic/framework/dto/healthcheck/RequestSqlAuditVo.java
new file mode 100644
index 000000000..9c3350df3
--- /dev/null
+++ b/src/main/java/neatlogic/framework/dto/healthcheck/RequestSqlAuditVo.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2025 深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package neatlogic.framework.dto.healthcheck;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+public class RequestSqlAuditVo {
+ // 没有使用缓存的总耗时
+ private long notUseCacheTotalTimeCost = 0;
+ // 总耗时
+ private long totalTimeCost = 0;
+ // 相同IDSql审计列表
+ private final List sameIdSqlAuditList = Collections.synchronizedList(new ArrayList<>());
+
+ public long getNotUseCacheTotalTimeCost() {
+ return this.notUseCacheTotalTimeCost;
+ }
+
+ public long getTotalTimeCost() {
+ return this.totalTimeCost;
+ }
+
+ public List getSameIdSqlAuditList() {
+ return this.sameIdSqlAuditList;
+ }
+
+ public void addSqlAudit(SqlAuditVo sqlAuditVo) {
+ if (sqlAuditVo != null) {
+ int notUseCacheCount = 0;
+ long notUseCacheTimeCost = 0;
+ long timeCost = sqlAuditVo.getTimeCost();
+ this.totalTimeCost += timeCost;
+ if (StringUtils.isBlank(sqlAuditVo.getUseCacheLevel())) {
+ notUseCacheCount = 1;
+ notUseCacheTimeCost = timeCost;
+ this.notUseCacheTotalTimeCost += timeCost;
+ }
+ SameIdSqlAuditVo sameIdSqlAuditVo = null;
+ for (SameIdSqlAuditVo sameIdSqlAudit : this.sameIdSqlAuditList) {
+ if (Objects.equals(sameIdSqlAudit.getId(), sqlAuditVo.getId())) {
+ sameIdSqlAuditVo = sameIdSqlAudit;
+ }
+ }
+ if (sameIdSqlAuditVo == null) {
+ sameIdSqlAuditVo = new SameIdSqlAuditVo(sqlAuditVo.getId());//, timeCost, notUseCacheTimeCost, notUseCacheCount, sqlAuditVo.getUseCacheLevel(), sqlAuditVo.getSql()
+ this.sameIdSqlAuditList.add(sameIdSqlAuditVo);
+ }
+ sameIdSqlAuditVo.setTotalTimeCost(sameIdSqlAuditVo.getTotalTimeCost() + timeCost);
+ sameIdSqlAuditVo.setNotUseCacheTotalTimeCost(sameIdSqlAuditVo.getNotUseCacheTotalTimeCost() + notUseCacheTimeCost);
+ sameIdSqlAuditVo.setNotUseCacheCount(sameIdSqlAuditVo.getNotUseCacheCount() + notUseCacheCount);
+ sameIdSqlAuditVo.getTimeCostList().add(timeCost);
+ sameIdSqlAuditVo.getUseCacheLevelList().add(sqlAuditVo.getUseCacheLevel());
+ sameIdSqlAuditVo.getSqlList().add(sqlAuditVo.getSql());
+ }
+ }
+
+ public static class SameIdSqlAuditVo {
+ // sqlID
+ private final String id;
+ // 耗时列表
+ private final List timeCostList = Collections.synchronizedList(new ArrayList<>());
+ // 总耗时
+ private long totalTimeCost = 0;
+ // 没有使用缓存的总耗时
+ private long notUseCacheTotalTimeCost = 0;
+ // 没有使用缓存的次数
+ private int notUseCacheCount = 0;
+ // 是否使用缓存列表
+ private final List useCacheLevelList = Collections.synchronizedList(new ArrayList<>());
+ // sql语句列表
+ private final List sqlList = Collections.synchronizedList(new ArrayList<>());
+
+ public SameIdSqlAuditVo(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public List getTimeCostList() {
+ return timeCostList;
+ }
+
+ public long getTotalTimeCost() {
+ return totalTimeCost;
+ }
+
+ public void setTotalTimeCost(long totalTimeCost) {
+ this.totalTimeCost = totalTimeCost;
+ }
+
+ public long getNotUseCacheTotalTimeCost() {
+ return notUseCacheTotalTimeCost;
+ }
+
+ public void setNotUseCacheTotalTimeCost(long notUseCacheTotalTimeCost) {
+ this.notUseCacheTotalTimeCost = notUseCacheTotalTimeCost;
+ }
+
+ public int getNotUseCacheCount() {
+ return notUseCacheCount;
+ }
+
+ public void setNotUseCacheCount(int notUseCacheCount) {
+ this.notUseCacheCount = notUseCacheCount;
+ }
+
+ public List getUseCacheLevelList() {
+ return useCacheLevelList;
+ }
+
+ public List getSqlList() {
+ return sqlList;
+ }
+ }
+}
diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java
index 7fc34b901..38c989677 100644
--- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java
+++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java
@@ -164,6 +164,7 @@ public class AnonymousApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSON.parseObject(JSON.toJSONString(returnV)));
}
@@ -191,6 +192,7 @@ public class AnonymousApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSON.parseObject(JSON.toJSONString(returnV)));
}
@@ -218,6 +220,7 @@ public class AnonymousApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSON.parseObject(JSON.toJSONString(returnV)));
}
@@ -245,6 +248,7 @@ public class AnonymousApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
}
diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java
index d4cd2550e..778df30fe 100644
--- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java
+++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java
@@ -183,6 +183,7 @@ public class ApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
}
@@ -213,6 +214,7 @@ public class ApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
}
@@ -239,6 +241,7 @@ public class ApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
}
@@ -265,6 +268,7 @@ public class ApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
}
diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java
index aaba52402..43ca478bc 100644
--- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java
+++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java
@@ -195,6 +195,7 @@ public class PublicApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(returnV)));
}
@@ -218,6 +219,7 @@ public class PublicApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(returnV)));
}
@@ -241,6 +243,7 @@ public class PublicApiDispatcher {
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+ returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(returnV)));
}
--
Gitee
From ecb2233ffb945b5e7880440ea1adac4ba799dc6f Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 16 Jul 2025 09:59:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20sql=E7=9B=91?=
=?UTF-8?q?=E6=8E=A7=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1=E6=8C=87=E5=AE=9A?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8B=A6=E6=88=AA=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1460056485232640]sql监控增加统计指定接口拦截统计 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1460056485232640
---
.../framework/dao/plugin/SqlCostInterceptor.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java b/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java
index 031148753..5865548ff 100644
--- a/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java
+++ b/src/main/java/neatlogic/framework/dao/plugin/SqlCostInterceptor.java
@@ -56,7 +56,6 @@ public class SqlCostInterceptor implements Interceptor {
public static class SqlIdMap {
private static final Set sqlSet = new HashSet<>();
- private static final String URL_PREFIX = "/neatlogic/api/rest/";
public static void addId(String id) {
sqlSet.add(id);
@@ -81,14 +80,14 @@ public class SqlCostInterceptor implements Interceptor {
if (sqlSet.contains(id)) {
return true;
}
+ // 支持接口token作为监控目标
RequestContext requestContext = RequestContext.get();
if (requestContext != null && StringUtils.isNotBlank(requestContext.getUrl())) {
- String url = requestContext.getUrl();
- if (url.contains(URL_PREFIX)) {
- url = url.substring(URL_PREFIX.length());
- }
- if (sqlSet.contains(url)) {
- return true;
+ // 这里requestContext.getUrl()值为/neatlogic/api/rest/xxx/yyy/zzz
+ for (String element : sqlSet) {
+ if (requestContext.getUrl().endsWith(element)) {
+ return true;
+ }
}
}
if (id.contains(".")) {
--
Gitee
From 17497e5d3d6a0481c5e125bf2aaa81aa2f7294c1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 16 Jul 2025 10:20:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20sql=E7=9B=91?=
=?UTF-8?q?=E6=8E=A7=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1=E6=8C=87=E5=AE=9A?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8B=A6=E6=88=AA=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1460056485232640]sql监控增加统计指定接口拦截统计 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1460056485232640
---
.../threadlocal/RequestContext.java | 25 +++++++++++--------
.../handler/AnonymousApiDispatcher.java | 9 +++----
.../dispatch/handler/ApiDispatcher.java | 9 +++----
.../dispatch/handler/PublicApiDispatcher.java | 6 ++---
4 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
index 9e397a9e8..3618f8b7f 100644
--- a/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
+++ b/src/main/java/neatlogic/framework/asynchronization/threadlocal/RequestContext.java
@@ -47,7 +47,7 @@ public class RequestContext implements Serializable {
//语言
Locale locale;
//收集该请求执行的sql语句
- private List sqlAuditList = Collections.synchronizedList(new ArrayList<>());
+// private List sqlAuditList = Collections.synchronizedList(new ArrayList<>());
private RequestSqlAuditVo requestSqlAuditVo;
@@ -115,16 +115,16 @@ public class RequestContext implements Serializable {
this.locale = locale;
}
- public List getSqlAuditList() {
- return sqlAuditList;
- }
-
- public void setSqlAuditList(List sqlAuditList) {
- this.sqlAuditList = sqlAuditList;
- }
+// public List getSqlAuditList() {
+// return sqlAuditList;
+// }
+//
+// public void setSqlAuditList(List sqlAuditList) {
+// this.sqlAuditList = sqlAuditList;
+// }
public void addSqlAudit(SqlAuditVo sqlAuditVo) {
- sqlAuditList.add(sqlAuditVo);
+// sqlAuditList.add(sqlAuditVo);
if (requestSqlAuditVo == null) {
requestSqlAuditVo = new RequestSqlAuditVo();
}
@@ -135,12 +135,17 @@ public class RequestContext implements Serializable {
return requestSqlAuditVo;
}
+ public void setRequestSqlAuditVo(RequestSqlAuditVo requestSqlAuditVo) {
+ this.requestSqlAuditVo = requestSqlAuditVo;
+ }
+
public static RequestContext init(RequestContext _requestContext) {
RequestContext context = new RequestContext();
if (_requestContext != null) {
context.setUrl(_requestContext.getUrl());
context.setLocale(_requestContext.getLocale());
- context.setSqlAuditList(_requestContext.getSqlAuditList());
+// context.setSqlAuditList(_requestContext.getSqlAuditList());
+ context.setRequestSqlAuditVo(_requestContext.getRequestSqlAuditVo());
context.setRemoteAddr(_requestContext.getRemoteAddr());
String tempUrl = _requestContext.getUrl();
if (tempUrl == null) {
diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java
index 38c989677..b96fe0f87 100644
--- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java
+++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java
@@ -48,7 +48,6 @@ import neatlogic.framework.restful.ratelimiter.RateLimiterTokenBucket;
import neatlogic.framework.util.$;
import neatlogic.framework.util.AnonymousApiTokenUtil;
import neatlogic.module.framework.restful.counter.ApiAccessCountService;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
@@ -163,7 +162,7 @@ public class AnonymousApiDispatcher {
returnObj.put("TimeCost", endTime - startTime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSON.parseObject(JSON.toJSONString(returnV)));
@@ -191,7 +190,7 @@ public class AnonymousApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSON.parseObject(JSON.toJSONString(returnV)));
@@ -219,7 +218,7 @@ public class AnonymousApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSON.parseObject(JSON.toJSONString(returnV)));
@@ -247,7 +246,7 @@ public class AnonymousApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java
index 778df30fe..a09a0aa0b 100644
--- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java
+++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java
@@ -45,7 +45,6 @@ import neatlogic.framework.util.$;
import neatlogic.framework.util.HttpRequestUtil;
import neatlogic.framework.util.mongodb.IJsonSerializer;
import neatlogic.module.framework.restful.counter.ApiAccessCountService;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.reflections.Reflections;
@@ -182,7 +181,7 @@ public class ApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
@@ -213,7 +212,7 @@ public class ApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
@@ -240,7 +239,7 @@ public class ApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
@@ -267,7 +266,7 @@ public class ApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
if (restComponent.disableReturnCircularReferenceDetect()) {
returnObj.put("_disableDetect", true);
diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java
index 43ca478bc..306a37714 100644
--- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java
+++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java
@@ -194,7 +194,7 @@ public class PublicApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(returnV)));
@@ -218,7 +218,7 @@ public class PublicApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(returnV)));
@@ -242,7 +242,7 @@ public class PublicApiDispatcher {
returnObj.put("TimeCost", endtime - starttime);
returnObj.put("Return", returnV);
returnObj.put("Status", "OK");
- returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
+// returnObj.put("sqlList", CollectionUtils.isEmpty(RequestContext.get().getSqlAuditList()) ? null : RequestContext.get().getSqlAuditList());
returnObj.put("requestSqlAudit", RequestContext.get().getRequestSqlAuditVo());
} else {
returnObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(returnV)));
--
Gitee