From a19e218f8d3bb9e5a4ec3410738ef7ed0ef7786e Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Wed, 30 Aug 2023 16:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86log=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-main/pom.xml   |  6 ++++++
 adc-da-report/pom.xml | 22 ++++++++++++++++++++++
 pom.xml               |  7 +++----
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index 1dbd51f..b8eb0a6 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -144,6 +144,12 @@
             <groupId>com.adc</groupId>
             <artifactId>adc-da-report</artifactId>
             <version>2.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-core</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/adc-da-report/pom.xml b/adc-da-report/pom.xml
index e38e5bf..1221a83 100644
--- a/adc-da-report/pom.xml
+++ b/adc-da-report/pom.xml
@@ -28,6 +28,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -118,6 +128,18 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.11</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.2.11</version>
+        </dependency>
+
     </dependencies>
 
 
diff --git a/pom.xml b/pom.xml
index 7681dd4..13e50a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,13 +220,13 @@
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-api</artifactId>
-				<version>2.16.0</version>
+				<version>2.17.0</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-to-slf4j</artifactId>
-				<version>2.16.0</version>
+				<version>2.17.0</version>
 			</dependency>
 
 			<dependency>
@@ -531,10 +531,9 @@
 			</dependency>
 
 		</dependencies>
-
-
 	</dependencyManagement>
 
+
 	<!-- Profiles for different environment -->
 	<profiles>
 		<profile>