DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理日志版本升级问题

Browse Source
This commit is contained in:
zer0Black
2023-08-30 18:11:39 +08:00
parent a19e218f8d
commit 92c417912d
6 changed files with 80 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-login/pom.xml
+12
View File
@@ -108,6 +108,12 @@
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-sys</artifactId> <artifactId>adc-da-sys</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
<!--<exclusions>--> <!--<exclusions>-->
<!--<exclusion>--> <!--<exclusion>-->
<!--<artifactId>adc-da-util</artifactId>--> <!--<artifactId>adc-da-util</artifactId>-->
@@ -174,6 +180,12 @@
</dependency> </dependency>
<!-- EHCACHE end --> <!-- EHCACHE end -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.9</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
adc-da-main/pom.xml
+28
View File
@@ -132,12 +132,24 @@
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-login</artifactId> <artifactId>adc-da-login</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-sys</artifactId> <artifactId>adc-da-sys</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@@ -149,6 +161,10 @@
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@@ -246,6 +262,12 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@@ -378,6 +400,12 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.9</version>
</dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>javax.mail</groupId>--> <!-- <groupId>javax.mail</groupId>-->
<!-- <artifactId>mailapi</artifactId>--> <!-- <artifactId>mailapi</artifactId>-->
adc-da-report/pom.xml
+14 -8
View File
@@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>com.huaweicloud</groupId> <groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java-bundle</artifactId> <artifactId>esdk-obs-java-bundle</artifactId>
<version>[3.21.11,)</version> <version>3.23.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -79,12 +79,24 @@
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-sys</artifactId> <artifactId>adc-da-sys</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-login</artifactId> <artifactId>adc-da-login</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@@ -131,13 +143,7 @@
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.2.11</version> <version>1.2.9</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.2.11</version>
</dependency> </dependency>
</dependencies> </dependencies>
adc-da-sys/pom.xml
+12
View File
@@ -101,6 +101,12 @@
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
@@ -176,6 +182,12 @@
<version>3.10.2</version> <version>3.10.2</version>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.9</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
pom.xml
+1 -2
View File
@@ -24,6 +24,7 @@
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<fastjson.version>1.2.9</fastjson.version> <fastjson.version>1.2.9</fastjson.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
<log4j2.version>2.17.0</log4j2.version>
<aspectj.version>1.8.5</aspectj.version> <aspectj.version>1.8.5</aspectj.version>
<jackson.version>2.12.5</jackson.version> <jackson.version>2.12.5</jackson.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
@@ -220,13 +221,11 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>2.17.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId> <artifactId>log4j-to-slf4j</artifactId>
<version>2.17.0</version>
</dependency> </dependency>
<dependency> <dependency>
report-activity/pom.xml
+13
View File
@@ -22,6 +22,12 @@
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@@ -81,6 +87,13 @@
<version>2.5.0</version> <version>2.5.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.9</version>
</dependency>
</dependencies> </dependencies>
</project> </project>