From 41ca5fae61a8a95eb0a5487b5fa8024393bb2df9 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 11 Jan 2024 17:26:46 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/common/lucene/AsyncLuceneAppender.java   | 1 -
 .../src/main/java/org/nl/common/utils/RedissonUtils.java      | 2 +-
 .../src/main/java/org/nl/config/DruidFilter.java              | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/AsyncLuceneAppender.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/AsyncLuceneAppender.java
index 32a926a5..6502fa02 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/AsyncLuceneAppender.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/AsyncLuceneAppender.java
@@ -42,7 +42,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/common/utils/RedissonUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
index 0c3912a0..797cb43b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
@@ -41,7 +41,7 @@ public class RedissonUtils {
             ex.printStackTrace();
             throw ex;
         }finally {
-            if (isLock){
+            if (isLock && lock.isHeldByCurrentThread()){
                 lock.unlock();
             }
         }
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 7bd2ace5..1d959112 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
@@ -46,7 +46,7 @@ public class DruidFilter extends FilterEventAdapter {
         try {
             count=statement.getUpdateCount();
         }catch (Exception ex){ }
-        if (StringUtils.isNotBlank(traceId) && count>0) {
+        if (count>0) {
             if (size > 0) {
                 Collection<JdbcParameter> values = statement.getParameters().values();
                 List<Object> params = new ArrayList<>();
@@ -64,7 +64,7 @@ public class DruidFilter extends FilterEventAdapter {
         ResultSetProxy rs = super.statement_getResultSet(chain, statement);
         String executeSql = statement.getLastExecuteSql();
         String traceId = MDC.get("traceId");
-        if (StringUtils.isNotBlank(traceId)){
+        if (true){
             int result = 0;
             if (rs != null) {
                 ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class);