From 3b9b517d99b39a23fc178344e0be3666503a9e45 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 20 Jun 2025 10:50:38 +0800
Subject: [PATCH] 'commit'

---
 dsBase/pom.xml  |  6 ++++++
 dsUtils/pom.xml | 23 +++++------------------
 pom.xml         | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 18a9c866..1a1d3dad 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -173,6 +173,12 @@
             <artifactId>dsUtils</artifactId>
             <version>1.0</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/dsUtils/pom.xml b/dsUtils/pom.xml
index eac44e8e..6675b027 100644
--- a/dsUtils/pom.xml
+++ b/dsUtils/pom.xml
@@ -11,7 +11,6 @@
         <version>1.0</version>
     </parent>
 
-
     <dependencies>
         <!--jfinal主框架-->
         <dependency>
@@ -99,26 +98,14 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.9</version>
-        </dependency>
-
-        <!-- Log4j2 实现 -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j2-impl</artifactId>
-            <version>2.20.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.20.0</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
+        <!-- 添加Logback依赖 -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.20.0</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 6967b4f0..076841dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,23 @@
         <module>dsAi</module>
         <module>dsSso</module>
     </modules>
+    <dependencyManagement>
+        <dependencies>
+            <!-- 全局排除Log4j2 -->
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>2.20.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>2.20.0</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <!-- 使用阿里 maven 库 -->
     <repositories>
         <repository>