From e86765c6bc716f566738d7b2d9e309cbd5b25e87 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 28 七月 2023 13:53:05 +0800
Subject: [PATCH] * update springboot 3.0.8 => 3.1.2 * update spring-mybatis 3.0.1 => 3.0.2 * update easyexcel 3.3.1 => 3.3.2 * update hutool 5.8.18 => 5.8.20 * update redisson 3.20.1 => 3.23.1 * update dynamic-ds 4.1.1 => 4.1.2 * update mapstruct-plus 1.3.1 => 1.3.5 * update aws-java-sdk-s3 1.12.400 => 1.12.517 * update maven-surefire-plugin 3.0.0 => 3.1.2
---
ruoyi-extend/ruoyi-powerjob-server/pom.xml | 2 +-
ruoyi-admin/src/main/resources/application-prod.yml | 2 +-
pom.xml | 20 ++++++++++----------
ruoyi-admin/src/main/resources/application-dev.yml | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index b81d3ca..48c0217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,28 +14,28 @@
<properties>
<revision>5.1.0-BETA</revision>
- <spring-boot.version>3.0.8</spring-boot.version>
+ <spring-boot.version>3.1.2</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.1</spring-boot.mybatis>
+ <spring-boot.mybatis>3.0.2</spring-boot.mybatis>
<springdoc.version>2.1.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
- <easyexcel.version>3.3.1</easyexcel.version>
+ <easyexcel.version>3.3.2</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.35.0.RC</satoken.version>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.18</hutool.version>
+ <hutool.version>5.8.20</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>3.0.4</spring-boot-admin.version>
- <redisson.version>3.20.1</redisson.version>
+ <spring-boot-admin.version>3.1.3</spring-boot-admin.version>
+ <redisson.version>3.23.1</redisson.version>
<lock4j.version>2.2.4</lock4j.version>
- <dynamic-ds.version>4.1.1</dynamic-ds.version>
+ <dynamic-ds.version>4.1.2</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<powerjob.version>4.3.3</powerjob.version>
- <mapstruct-plus.version>1.3.1</mapstruct-plus.version>
+ <mapstruct-plus.version>1.3.5</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
<lombok.version>1.18.26</lombok.version>
<bouncycastle.version>1.72</bouncycastle.version>
@@ -47,7 +47,7 @@
<snakeyaml.version>1.33</snakeyaml.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.517</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
<sms4j.version>2.2.0</sms4j.version>
@@ -55,7 +55,7 @@
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
<maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison>
- <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
</properties>
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 87bd66d..897725c 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -106,7 +106,7 @@
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
- ssl: false
+ ssl.enabled: false
redisson:
# redis key鍓嶇紑
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 445ae8c..f9cddb9 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -109,7 +109,7 @@
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
- ssl: false
+ ssl.enabled: false
redisson:
# redis key鍓嶇紑
diff --git a/ruoyi-extend/ruoyi-powerjob-server/pom.xml b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
index 0a9ce70..60b4d27 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/pom.xml
+++ b/ruoyi-extend/ruoyi-powerjob-server/pom.xml
@@ -10,7 +10,7 @@
<artifactId>ruoyi-powerjob-server</artifactId>
<properties>
- <spring-boot.version>2.7.12</spring-boot.version>
+ <spring-boot.version>2.7.14</spring-boot.version>
<spring-boot-admin.version>2.7.10</spring-boot-admin.version>
</properties>
<dependencyManagement>
--
Gitblit v1.9.3