From 92c417912d7ba39c73082f3fe3bc61e1b3cef8f4 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Wed, 30 Aug 2023 18:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=A5=E5=BF=97=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8D=87=E7=BA=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-login/pom.xml    | 12 ++++++++++++
 adc-da-main/pom.xml     | 28 ++++++++++++++++++++++++++++
 adc-da-report/pom.xml   | 22 ++++++++++++++--------
 adc-da-sys/pom.xml      | 12 ++++++++++++
 pom.xml                 |  3 +--
 report-activity/pom.xml | 13 +++++++++++++
 6 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/adc-da-login/pom.xml b/adc-da-login/pom.xml
index 587a011..0f8fa98 100644
--- a/adc-da-login/pom.xml
+++ b/adc-da-login/pom.xml
@@ -108,6 +108,12 @@
             <groupId>com.adc</groupId>
             <artifactId>adc-da-sys</artifactId>
             <version>2.5.0</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>logback-classic</artifactId>
+					<groupId>ch.qos.logback</groupId>
+				</exclusion>
+			</exclusions>
 			<!--<exclusions>-->
 				<!--<exclusion>-->
 					<!--<artifactId>adc-da-util</artifactId>-->
@@ -174,6 +180,12 @@
 		</dependency>
 		<!-- EHCACHE end -->
 
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.9</version>
+		</dependency>
+
     </dependencies>
 
 	<build>
diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index b8eb0a6..707c128 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -132,12 +132,24 @@
             <groupId>com.adc</groupId>
             <artifactId>adc-da-login</artifactId>
             <version>2.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.adc</groupId>
             <artifactId>adc-da-sys</artifactId>
             <version>2.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -149,6 +161,10 @@
                     <artifactId>log4j-core</artifactId>
                     <groupId>org.apache.logging.log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -246,6 +262,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -378,6 +400,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>javax.mail</groupId>-->
 <!--            <artifactId>mailapi</artifactId>-->
diff --git a/adc-da-report/pom.xml b/adc-da-report/pom.xml
index 1221a83..b940d2b 100644
--- a/adc-da-report/pom.xml
+++ b/adc-da-report/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.huaweicloud</groupId>
             <artifactId>esdk-obs-java-bundle</artifactId>
-            <version>[3.21.11,)</version>
+            <version>3.23.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -79,12 +79,24 @@
             <groupId>com.adc</groupId>
             <artifactId>adc-da-sys</artifactId>
             <version>2.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.adc</groupId>
             <artifactId>adc-da-login</artifactId>
             <version>2.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -131,13 +143,7 @@
         <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>
+            <version>1.2.9</version>
         </dependency>
 
     </dependencies>
diff --git a/adc-da-sys/pom.xml b/adc-da-sys/pom.xml
index 6ad4eea..c894f2d 100644
--- a/adc-da-sys/pom.xml
+++ b/adc-da-sys/pom.xml
@@ -101,6 +101,12 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
@@ -176,6 +182,12 @@
             <version>3.10.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 13e50a2..4e40dff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
 		<junit.version>4.12</junit.version>
 		<fastjson.version>1.2.9</fastjson.version>
 		<slf4j.version>1.7.21</slf4j.version>
+		<log4j2.version>2.17.0</log4j2.version>
 		<aspectj.version>1.8.5</aspectj.version>
 		<jackson.version>2.12.5</jackson.version>
 		<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
@@ -220,13 +221,11 @@
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-api</artifactId>
-				<version>2.17.0</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-to-slf4j</artifactId>
-				<version>2.17.0</version>
 			</dependency>
 
 			<dependency>
diff --git a/report-activity/pom.xml b/report-activity/pom.xml
index b83f03c..73697e2 100644
--- a/report-activity/pom.xml
+++ b/report-activity/pom.xml
@@ -22,6 +22,12 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-classic</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -81,6 +87,13 @@
             <version>2.5.0</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file