From 0e6464d3449fa6c239f8a26991ab2259d99b4aae 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:10:11 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                    | 20 +++++---------------
 ruoyi-extend/ruoyi-powerjob-server/pom.xml |  4 ++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60254e86..8aac718d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,23 +14,23 @@
 
     <properties>
         <revision>5.1.0</revision>
-        <spring-boot.version>3.1.4</spring-boot.version>
+        <spring-boot.version>3.1.5</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
         <spring-boot.mybatis>3.0.2</spring-boot.mybatis>
         <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>
         <velocity.version>2.3</velocity.version>
-        <satoken.version>1.36.0</satoken.version>
+        <satoken.version>1.37.0</satoken.version>
         <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.8.22</hutool.version>
         <okhttp.version>4.10.0</okhttp.version>
-        <spring-boot-admin.version>3.1.6</spring-boot-admin.version>
-        <redisson.version>3.23.5</redisson.version>
+        <spring-boot-admin.version>3.1.7</spring-boot-admin.version>
+        <redisson.version>3.24.1</redisson.version>
         <lock4j.version>2.2.5</lock4j.version>
         <dynamic-ds.version>4.1.3</dynamic-ds.version>
         <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
@@ -43,9 +43,6 @@
         <!-- 离线IP地址定位库 -->
         <ip2region.version>2.7.0</ip2region.version>
 
-        <!-- 临时修复 snakeyaml 漏洞 -->
-        <snakeyaml.version>1.33</snakeyaml.version>
-
         <!-- OSS 配置 -->
         <aws-java-sdk-s3.version>1.12.540</aws-java-sdk-s3.version>
         <!-- SMS 配置 -->
@@ -290,13 +287,6 @@
                 <version>${alibaba-ttl.version}</version>
             </dependency>
 
-            <!-- 临时修复 snakeyaml 漏洞 -->
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
-
             <!-- 加密包引入 -->
             <dependency>
                 <groupId>org.bouncycastle</groupId>
diff --git a/ruoyi-extend/ruoyi-powerjob-server/pom.xml b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
index 60b4d27f..72b23789 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/pom.xml
+++ b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
@@ -10,8 +10,8 @@
     <artifactId>ruoyi-powerjob-server</artifactId>
 
     <properties>
-        <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>
     </properties>
     <dependencyManagement>
         <dependencies>