From 1aee5cc43093752a1b0ab9f69ef8ee19294fa619 Mon Sep 17 00:00:00 2001
From: watercoding <809946991@qq.com>
Date: Mon, 7 Oct 2024 13:40:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BE=9D=E8=B5=96):=201.=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20spring=20boot=20pom=E7=AE=A1=E7=90=86=EF=BC=9B=202.?=
 =?UTF-8?q?=20=E5=8D=87=E7=BA=A7=20jackson-jsr310=E3=80=81commons-io?=
 =?UTF-8?q?=E3=80=81httpclient=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=9B=203.=20=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 47 +++++++++----------
 ruoyi-auth/ruoyi-auth-common/pom.xml          |  1 +
 ruoyi-common/pom.xml                          | 29 ++----------
 ruoyi-plugins/pom.xml                         | 17 +------
 .../ruoyi-mybatis-interceptor/pom.xml         |  5 --
 ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml       |  7 ---
 ruoyi-plugins/ruoyi-mybatis-plus/pom.xml      |  3 +-
 7 files changed, 28 insertions(+), 81 deletions(-)

diff --git a/pom.xml b/pom.xml
index a719a0f..a8d6099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,12 @@
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
         <fastjson.version>2.0.45</fastjson.version>
-        <jackson.version>2.9.8</jackson.version>
+        <jackson.version>2.18.0</jackson.version>
         <oshi.version>6.6.3</oshi.version>
-        <commons.io.version>2.11.0</commons.io.version>
+        <commons.io.version>2.17.0</commons.io.version>
         <commons.collections.version>3.2.2</commons.collections.version>
         <poi.version>5.2.3</poi.version>
-        <httpclient.version>4.5.2</httpclient.version>
+        <httpclient.version>4.5.14</httpclient.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.12.5</jwt.version>
         <knife4j.version>4.5.0</knife4j.version>
@@ -41,33 +41,26 @@
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jaxb.version>4.0.5</jaxb.version>
         <springdoc.version>2.1.0</springdoc.version>
-        <jakarta.version>6.0.0</jakarta.version>
     </properties>
 
-
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
             <!-- spring-boot -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
+                <artifactId>spring-boot-starter-parent</artifactId>
                 <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
-            <!-- mybatis 简化JDBC -->
+            <!-- mybatis -->
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>
                 <artifactId>mybatis-spring-boot-starter</artifactId>
                 <version>${mybatis-spring-boot.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis</artifactId>
-                <version>3.5.16</version>
-            </dependency>
 
             <!-- jaxb 处理xml -->
             <dependency>
@@ -86,7 +79,6 @@
                 <version>${jaxb.version}</version>
             </dependency>
 
-
             <!-- Mysql驱动包 -->
             <dependency>
                 <groupId>com.mysql</groupId>
@@ -115,7 +107,6 @@
                 <artifactId>transactions-spring-boot3-starter</artifactId>
                 <version>${transactions.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>javax.transaction</groupId>
                 <artifactId>jta</artifactId>
@@ -134,6 +125,13 @@
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>
                 <version>${pagehelper.boot.version}</version>
+                <!-- 排除低版本的 mybatis -->
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mybatis</groupId>
+                        <artifactId>mybatis</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- 获取系统信息 -->
@@ -238,12 +236,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>jakarta.servlet</groupId>
-                <artifactId>jakarta.servlet-api</artifactId>
-                <version>${jakarta.version}</version>
-            </dependency>
-
             <!-- 核心模块-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -315,17 +307,18 @@
     </modules>
     <packaging>pom</packaging>
 
-
-    <dependencies>
-
-    </dependencies>
-
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <parameters>true</parameters>
                     <source>${java.version}</source>
@@ -336,6 +329,7 @@
         </plugins>
     </build>
 
+    <!-- 依赖下载 -->
     <repositories>
         <repository>
             <id>public</id>
@@ -347,6 +341,7 @@
         </repository>
     </repositories>
 
+    <!-- 插件下载 -->
     <pluginRepositories>
         <pluginRepository>
             <id>public</id>
diff --git a/ruoyi-auth/ruoyi-auth-common/pom.xml b/ruoyi-auth/ruoyi-auth-common/pom.xml
index 42a6b6f..1de7196 100644
--- a/ruoyi-auth/ruoyi-auth-common/pom.xml
+++ b/ruoyi-auth/ruoyi-auth-common/pom.xml
@@ -27,6 +27,7 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 52edb27..8472bb9 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -16,16 +16,10 @@
 
     <dependencies>
 
-        <!-- Spring框架基本的核心工具 -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
         <!-- SpringWeb模块 -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <!-- spring security 安全认证 -->
@@ -52,12 +46,6 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-        <!-- JSON工具类 -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
         <!--引入jsr310模块 支持java8的时间序列化 -->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -88,12 +76,6 @@
             <artifactId>poi-ooxml</artifactId>
         </dependency>
 
-        <!-- yml解析器 -->
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-        </dependency>
-
         <!-- Token生成与解析-->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -141,12 +123,7 @@
             <artifactId>UserAgentUtils</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-        </dependency>
-
-        <!-- mybatis 简化JDBC -->
+        <!-- mybatis -->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
diff --git a/ruoyi-plugins/pom.xml b/ruoyi-plugins/pom.xml
index f956740..358faf8 100644
--- a/ruoyi-plugins/pom.xml
+++ b/ruoyi-plugins/pom.xml
@@ -11,9 +11,8 @@
     <artifactId>ruoyi-plugins</artifactId>
 
     <properties>
-        <ruoyi.version>3.8.8.3.1</ruoyi.version>
         <ehcache.version>3.10.8</ehcache.version>
-        <mybatis-plus-boot-starter.version>3.5.5</mybatis-plus-boot-starter.version>
+        <mybatis-plus.version>3.5.8</mybatis-plus.version>
     </properties>
 
     <description>
@@ -28,22 +27,10 @@
                 <version>${ehcache.version}</version>
             </dependency>
 
-            <!-- mybatis-plus 增强CRUD -->
-            <!-- <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.mybatis</groupId>
-                        <artifactId>mybatis-spring</artifactId>
-                    </exclusion>
-                </exclusions>
-                <version>${mybatis-plus-boot-starter.version}</version>
-            </dependency> -->
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-                <version>3.5.7</version>
+                <version>${mybatis-plus.version}</version>
             </dependency>
 
             <!-- ruoyi-ehcache-->
diff --git a/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml b/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml
index 5d13862..61bedba 100644
--- a/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml
+++ b/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml
@@ -11,11 +11,6 @@
 
     <artifactId>ruoyi-mybatis-interceptor</artifactId>
 
-    <properties>
-        <maven.compiler.source>19</maven.compiler.source>
-        <maven.compiler.target>19</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml b/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml
index 6994e53..93c6038 100644
--- a/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml
+++ b/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml
@@ -22,13 +22,6 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
-        <!-- mybatis-plus 增强CRUD -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <optional>true</optional>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml b/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml
index b3ab16b..04d3b13 100644
--- a/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml
+++ b/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml
@@ -22,12 +22,11 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
-        <!-- mybatis-plus 增强CRUD -->
+        <!-- mybatis plus -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>