From bbe3399c90b489ab85281d99e1b279b25eb1f4d7 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 9 Feb 2022 16:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=A1=B9=E7=9B=AE=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AE=89=E5=85=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/pom.xml | 73 ++++++++++++++++++++++++++++++++++++++++-------
 pom.xml           | 50 +++++++++++++++-----------------
 2 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index 7b6af4cb..654b5d3c 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -35,6 +35,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -72,6 +78,10 @@
                     <artifactId>HdrHistogram</artifactId>
                     <groupId>org.hdrhistogram</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -81,6 +91,12 @@
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -96,17 +112,17 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>${mybatis-plus-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter-test</artifactId>
-            <version>2.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Mysql Connector -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-connector-version}</version>
         </dependency>
         <!-- Redis-->
         <dependency>
@@ -119,6 +135,12 @@
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>${knife4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Hutool工具包 -->
         <dependency>
@@ -148,6 +170,12 @@
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>
             <version>${aliyun-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- 阿里云OSS -->
         <dependency>
@@ -171,6 +199,10 @@
                     <artifactId>org.jacoco.agent</artifactId>
                     <groupId>org.jacoco</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!--脚本编程-->
@@ -188,6 +220,10 @@
                     <artifactId>fastjson</artifactId>
                     <groupId>com.alibaba</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!--   token加密 -->
@@ -212,6 +248,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 解决版本提示问题 -->
@@ -241,6 +283,14 @@
                     <artifactId>commons-collections4</artifactId>
                     <groupId>org.apache.commons</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>antlr4-runtime</artifactId>
+                    <groupId>org.antlr</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -248,6 +298,12 @@
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-jdbc-spring-namespace</artifactId>
             <version>${sharding-jdbc-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--druid-->
         <dependency>
@@ -307,11 +363,6 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>${logstash-logback-encoder}</version>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>javax.interceptor</groupId>-->
-        <!--            <artifactId>javax.interceptor-api</artifactId>-->
-        <!--            <version>${interceptor-api}</version>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
diff --git a/pom.xml b/pom.xml
index 30e18428..b5c4d1b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,42 +19,38 @@
     <properties>
         <java.version>1.8</java.version>
         <revision>4.2.3</revision>
-        <docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry>
-        <images-version>1</images-version>
-        <alipay-sdk-version>4.22.17.ALL</alipay-sdk-version>
-        <mysql-connector-version>8.0.27</mysql-connector-version>
-        <mybatis-plus-version>3.4.3.4</mybatis-plus-version>
-        <Hutool-version>5.7.18</Hutool-version>
-        <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
-        <jasypt-version>3.0.0</jasypt-version>
-        <neetl-version>2.9.10</neetl-version>
-        <lombok-version>1.18.22</lombok-version>
-        <aliyun-version>4.5.18</aliyun-version>
-        <aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
-        <aliyun-sdk-dysms-version>2.0.8</aliyun-sdk-dysms-version>
-        <rocketmq-version>2.2.1</rocketmq-version>
-        <jwt-version>0.10.7</jwt-version>
-        <antlr4-runtime-version>4.7.2</antlr4-runtime-version>
-        <sharding-jdbc-version>4.0.0</sharding-jdbc-version>
-        <druid-version>1.1.20</druid-version>
-        <simple-http-version>1.0.3</simple-http-version>
-        <antlr4-version>4.7.2</antlr4-version>
-        <okhttp-version>4.4.1</okhttp-version>
-        <httpclient-version>4.5.12</httpclient-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <skipTests>true</skipTests>
+        <docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry>
+        <images-version>1</images-version>
+        <alipay-sdk-version>4.22.32.ALL</alipay-sdk-version>
+        <mybatis-plus-version>3.5.1</mybatis-plus-version>
+        <Hutool-version>5.7.20</Hutool-version>
+        <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
+        <jasypt-version>3.0.4</jasypt-version>
+        <neetl-version>2.9.10</neetl-version>
+        <lombok-version>1.18.22</lombok-version>
+        <aliyun-version>4.6.0</aliyun-version>
+        <aliyun-sdk-oss-version>3.14.0</aliyun-sdk-oss-version>
+        <aliyun-sdk-dysms-version>2.0.9</aliyun-sdk-dysms-version>
+        <rocketmq-version>2.2.1</rocketmq-version>
+        <jwt-version>0.11.2</jwt-version>
+        <sharding-jdbc-version>4.0.0</sharding-jdbc-version>
+        <druid-version>1.2.8</druid-version>
+        <simple-http-version>1.0.3</simple-http-version>
+        <antlr4-version>4.7.2</antlr4-version>
+        <antlr4-runtime-version>4.7.2</antlr4-runtime-version>
         <knife4j.version>2.0.9</knife4j.version>
-        <de.codecentric>2.3.1</de.codecentric>
+        <de.codecentric>2.6.2</de.codecentric>
         <userAgentUtils>1.21</userAgentUtils>
-        <interceptor-api>1.2</interceptor-api>
         <poi-version>5.1.0</poi-version>
         <poi-ooxml-version>5.1.0</poi-ooxml-version>
-        <logstash-logback-encoder>6.6</logstash-logback-encoder>
+        <logstash-logback-encoder>7.0.1</logstash-logback-encoder>
         <zxing>3.4.1</zxing>
-        <slf4j-api>1.7.28</slf4j-api>
+        <slf4j-api>1.7.35</slf4j-api>
         <xk-time>3.2.3</xk-time>
-        <commons-text>1.4</commons-text>
+        <commons-text>1.9</commons-text>
         <enjoy.version>4.3</enjoy.version>
         <xxl-job>2.3.0</xxl-job>
         <spotify>1.2.2</spotify>