From ba3ed79cbfe0d8e0b1284c4f9d52f445a5742fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 20 Oct 2023 10:11:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20springboot=203.1.4=20=3D>=203.1.5=20up?=
 =?UTF-8?q?date=20springboot=202.7.14=20=3D>=202.7.17(=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1)=20update=20poi=205.2.3=20=3D>=205.2.4=20upd?=
 =?UTF-8?q?ate=20satoken=201.36.0=20=3D>=201.37.0=20update=20springboot-ad?=
 =?UTF-8?q?min=203.1.6=20=3D>=203.1.7=20update=20redisson=203.23.5=20=3D>?=
 =?UTF-8?q?=203.24.1=20update=20dubbo=203.2.5=20=3D>=203.2.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 20 +++++--------------
 ruoyi-common/ruoyi-common-alibaba-bom/pom.xml |  2 +-
 ruoyi-visual/ruoyi-nacos/pom.xml              |  4 ++--
 ruoyi-visual/ruoyi-powerjob-server/pom.xml    |  2 +-
 ruoyi-visual/ruoyi-seata-server/pom.xml       |  2 +-
 ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml |  2 +-
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a698791..376af2ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>3.1.4</spring-boot.version>
+        <spring-boot.version>3.1.5</spring-boot.version>
         <spring-cloud.version>2022.0.4</spring-cloud.version>
-        <spring-boot-admin.version>3.1.6</spring-boot-admin.version>
+        <spring-boot-admin.version>3.1.7</spring-boot-admin.version>
         <spring-boot.mybatis>3.0.2</spring-boot.mybatis>
         <mybatis.version>3.5.13</mybatis.version>
         <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
@@ -29,13 +29,13 @@
         <swagger.core.version>2.2.15</swagger.core.version>
         <springdoc.version>2.2.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
-        <poi.version>5.2.3</poi.version>
+        <poi.version>5.2.4</poi.version>
         <easyexcel.version>3.3.2</easyexcel.version>
         <hutool.version>5.8.22</hutool.version>
-        <redisson.version>3.23.5</redisson.version>
+        <redisson.version>3.24.1</redisson.version>
         <lock4j.version>2.2.5</lock4j.version>
         <powerjob.version>4.3.3</powerjob.version>
-        <satoken.version>1.36.0</satoken.version>
+        <satoken.version>1.37.0</satoken.version>
         <lombok.version>1.18.30</lombok.version>
         <logstash.version>7.4</logstash.version>
         <easy-es.version>1.1.1</easy-es.version>
@@ -48,9 +48,6 @@
         <justauth.version>1.16.5</justauth.version>
         <!-- 离线IP地址定位库 -->
         <ip2region.version>2.7.0</ip2region.version>
-
-        <!-- 临时修复 snakeyaml 漏洞 -->
-        <snakeyaml.version>1.33</snakeyaml.version>
         <!-- 临时修复 fastjson 漏洞 -->
         <fastjson.version>1.2.83</fastjson.version>
 
@@ -349,13 +346,6 @@
                 <version>${ip2region.version}</version>
             </dependency>
 
-            <!-- 临时修复 snakeyaml 漏洞 -->
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
index fa8b1658..d9bf12da 100644
--- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
@@ -19,7 +19,7 @@
         <sentinel.version>1.8.6</sentinel.version>
         <seata.version>1.7.1</seata.version>
         <nacos.client.version>2.2.1</nacos.client.version>
-        <dubbo.version>3.2.5</dubbo.version>
+        <dubbo.version>3.2.7</dubbo.version>
         <spring.context.support.version>1.0.11</spring.context.support.version>
     </properties>
     <dependencyManagement>
diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml
index 616ef385..be3b9b94 100644
--- a/ruoyi-visual/ruoyi-nacos/pom.xml
+++ b/ruoyi-visual/ruoyi-nacos/pom.xml
@@ -29,8 +29,8 @@
     <properties>
         <nacos.version>2.2.1</nacos.version>
         <!-- 需要与 Nacos 内置 Boot 版本保持一致 -->
-        <spring-boot.version>2.7.14</spring-boot.version>
-        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
+        <spring-boot.version>2.7.17</spring-boot.version>
+        <spring-boot-admin.version>2.7.11</spring-boot-admin.version>
         <nacos.lib.path>${project.basedir}/src/main/resources/lib</nacos.lib.path>
     </properties>
 
diff --git a/ruoyi-visual/ruoyi-powerjob-server/pom.xml b/ruoyi-visual/ruoyi-powerjob-server/pom.xml
index 8710dbc9..85513505 100644
--- a/ruoyi-visual/ruoyi-powerjob-server/pom.xml
+++ b/ruoyi-visual/ruoyi-powerjob-server/pom.xml
@@ -10,7 +10,7 @@
     <artifactId>ruoyi-powerjob-server</artifactId>
 
     <properties>
-        <spring-boot.version>2.7.14</spring-boot.version>
+        <spring-boot.version>2.7.17</spring-boot.version>
         <spring-cloud.version>2021.0.7</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
     </properties>
diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml
index a429b55c..fabb3d26 100644
--- a/ruoyi-visual/ruoyi-seata-server/pom.xml
+++ b/ruoyi-visual/ruoyi-seata-server/pom.xml
@@ -30,7 +30,7 @@
         <seata.version>1.7.1</seata.version>
         <jcommander.version>1.82</jcommander.version>
         <druid.version>1.2.12</druid.version>
-        <spring-boot.version>2.7.14</spring-boot.version>
+        <spring-boot.version>2.7.17</spring-boot.version>
         <native-build-tools-plugin.version>0.9.20</native-build-tools-plugin.version>
     </properties>
 
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
index b637bb45..58db0297 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <sentinel.version>1.8.6</sentinel.version>
         <curator.version>4.0.1</curator.version>
-        <spring-boot.version>2.7.14</spring-boot.version>
+        <spring-boot.version>2.7.17</spring-boot.version>
         <spring-cloud.version>2021.0.7</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
     </properties>