From fde624998f89ee20394bb5a310eaf53c744286f5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 13 十月 2022 15:59:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
pom.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index beeada1..0007144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<ruoyi-vue-plus.version>4.3.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.7.3</spring-boot.version>
+ <spring-boot.version>2.7.4</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@@ -25,21 +25,23 @@
<poi.version>5.2.2</poi.version>
<easyexcel.version>3.1.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.30.0</satoken.version>
+ <satoken.version>1.31.0</satoken.version>
<mybatis-plus.version>3.5.2</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.6</hutool.version>
+ <hutool.version>5.8.7</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>2.7.4</spring-boot-admin.version>
- <redisson.version>3.17.6</redisson.version>
+ <spring-boot-admin.version>2.7.5</spring-boot-admin.version>
+ <redisson.version>3.17.7</redisson.version>
<lock4j.version>2.2.2</lock4j.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
- <tlog.version>1.4.3</tlog.version>
+ <tlog.version>1.5.0</tlog.version>
<xxl-job.version>2.3.1</xxl-job.version>
<lombok.version>1.18.24</lombok.version>
<!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
<guava.version>31.1-jre</guava.version>
+ <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
+ <snakeyaml.version>1.32</snakeyaml.version>
<!-- OSS 閰嶇疆 -->
<aws-java-sdk-s3.version>1.12.300</aws-java-sdk-s3.version>
@@ -254,6 +256,13 @@
<version>${guava.version}</version>
</dependency>
+ <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟 -->
<dependency>
<groupId>com.ruoyi</groupId>
--
Gitblit v1.9.3