From 4f822844ed68c5a00b98210c9d8c0e13d3fc7ddd Mon Sep 17 00:00:00 2001
From: dftre <3066417822@qq.com>
Date: Wed, 12 Feb 2025 15:49:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?chore(dependencies):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E4=BB=A5?=
 =?UTF-8?q?=E6=8F=90=E9=AB=98=E5=85=BC=E5=AE=B9=E6=80=A7=E5=92=8C=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6c27d9..fafbbfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <spring-boot.version>3.4.1</spring-boot.version>
-        <druid.version>1.2.23</druid.version>
-        <dynamic.version>3.5.2</dynamic.version>
+        <spring-boot.version>3.4.2</spring-boot.version>
+        <druid.version>1.2.24</druid.version>
+        <dynamic.version>4.3.1</dynamic.version>
         <jta.version>1.1</jta.version>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
@@ -27,21 +27,21 @@
         <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
         <fastjson.version>2.0.53</fastjson.version>
         <jackson.version>2.18.0</jackson.version>
-        <oshi.version>6.6.5</oshi.version>
-        <commons.io.version>2.17.0</commons.io.version>
+        <oshi.version>6.6.6</oshi.version>
+        <commons.io.version>2.18.0</commons.io.version>
         <commons.collections.version>3.2.2</commons.collections.version>
-        <poi.version>5.3.0</poi.version>
+        <poi.version>5.4.0</poi.version>
         <httpclient.version>4.5.14</httpclient.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.12.6</jwt.version>
         <knife4j.version>4.5.0</knife4j.version>
-        <mybatis-spring-boot.version>3.0.3</mybatis-spring-boot.version>
+        <mybatis-spring-boot.version>3.0.4</mybatis-spring-boot.version>
         <!-- druid 的 xa暂时不支持 mysql 9.0.0+ 连接速度:8.3.0>8.2.0>8.4.0 -->
         <mysql.version>8.3.0</mysql.version>
         <postgresql.version>42.7.4</postgresql.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jaxb.version>4.0.5</jaxb.version>
-        <springdoc.version>2.1.0</springdoc.version>
+        <springdoc.version>2.8.4</springdoc.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -175,6 +175,12 @@
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
                 <version>${httpclient.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>commons-logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- collections工具类 -->

From 4e6e6b1c62c1883d12537c46077f248077d16dc3 Mon Sep 17 00:00:00 2001
From: dftre <3066417822@qq.com>
Date: Mon, 17 Feb 2025 16:36:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/framework/datasource/DataSourceCreate.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java
index 0c3f86e..cbf10fc 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java
@@ -27,6 +27,7 @@ public class DataSourceCreate implements CreateDataSource {
         DruidDataSource dataSource = new DruidDataSource();
         druidConfig.getDruidDataSources().add(dataSource);
         dataSource.setConnectProperties(prop);
+        dataSource.setDefaultAutoCommit(false);
         properties.setProperties(dataSource, prop);
         return dataSource;
     }

From 13afedd2fdf0c94f2ebc0fa106a73ddaaefceae1 Mon Sep 17 00:00:00 2001
From: dftre <3066417822@qq.com>
Date: Mon, 17 Feb 2025 16:55:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/framework/datasource/DataSourceCreate.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java
index cbf10fc..0c3f86e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceCreate.java
@@ -27,7 +27,6 @@ public class DataSourceCreate implements CreateDataSource {
         DruidDataSource dataSource = new DruidDataSource();
         druidConfig.getDruidDataSources().add(dataSource);
         dataSource.setConnectProperties(prop);
-        dataSource.setDefaultAutoCommit(false);
         properties.setProperties(dataSource, prop);
         return dataSource;
     }