From a4dee0902def4c901ab6bfa2bec3bd941e9b6117 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Fri, 12 Jan 2024 16:31:08 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96sql=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/config/DruidFilter.java          | 8 ++++----
 .../java/org/nl/config/lucene/AsyncLuceneAppender.java    | 1 -
 .../org/nl/modules/security/config/SecurityConfig.java    | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
index 1ee68525..434060a1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
@@ -39,14 +39,14 @@ public class DruidFilter extends FilterEventAdapter {
 
     @Override
     protected void statementExecuteAfter(StatementProxy statement, String sql, boolean result) {
-        String traceId = MDC.get("traceId");
+//        String traceId = MDC.get("traceId");
         int size = statement.getParametersSize();
         String executeSql = sql;
         int count = 0;
         try {
             count=statement.getUpdateCount();
         }catch (Exception ex){ }
-        if (true) {
+        if (size>0 && count>0) {
             Collection<JdbcParameter> values = statement.getParameters().values();
             List<Object> params = new ArrayList<>();
             for (JdbcParameter value : values) {
@@ -61,8 +61,8 @@ public class DruidFilter extends FilterEventAdapter {
     public ResultSetProxy statement_getResultSet(FilterChain chain, StatementProxy statement) throws SQLException {
         ResultSetProxy rs = super.statement_getResultSet(chain, statement);
         String executeSql = statement.getLastExecuteSql();
-        String traceId = MDC.get("traceId");
-        if (StringUtils.isNotEmpty(traceId)){
+//        String traceId = MDC.get("traceId");
+        if (true){
             int result = 0;
             if (rs != null) {
                 ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java
index 6a0573a5..cba58307 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java
@@ -25,7 +25,6 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender {
             if (mdcPropertyMap.getClass().getName().contains("SynchronizedMap")){
                 mdcPropertyMap.put("traceId",traceId);
             }
-            MDC.clear();
         }
         super.append(event);
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java
index 80a6454e..6e4f22c6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/SecurityConfig.java
@@ -119,6 +119,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/swagger-resources/**").permitAll()
                 .antMatchers("/webjars/**").permitAll()
                 .antMatchers("/*/api-docs").permitAll()
+                .antMatchers("/metrics/**").permitAll()
                 // 文件
                 .antMatchers("/avatar/**").permitAll()
                 .antMatchers("/file/**").permitAll()