From 55ce0e34c9183aebe802b91dba88cd54c6eaa48b Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:52:19 +0800
Subject: [PATCH] !480 优化单元格合并后多余内容的清除 * excel插件 优化合并策略 在合适的生命周期完成合并 去除被合并单元格的非首行内容
---
pom.xml | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 83eda6c..5ce37ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,28 +13,28 @@
<description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.1.1</revision>
- <spring-boot.version>3.1.5</spring-boot.version>
+ <revision>5.2.0-SNAPSHOT</revision>
+ <spring-boot.version>3.2.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.2</spring-boot.mybatis>
- <springdoc.version>2.2.0</springdoc.version>
+ <spring-boot.mybatis>3.0.3</spring-boot.mybatis>
+ <springdoc.version>2.3.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
- <easyexcel.version>3.3.2</easyexcel.version>
+ <easyexcel.version>3.3.3</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.37.0</satoken.version>
- <mybatis-plus.version>3.5.4</mybatis-plus.version>
+ <mybatis-plus.version>3.5.5</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.22</hutool.version>
+ <hutool.version>5.8.24</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>3.1.7</spring-boot-admin.version>
- <redisson.version>3.24.3</redisson.version>
- <lock4j.version>2.2.5</lock4j.version>
- <dynamic-ds.version>4.2.0</dynamic-ds.version>
- <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
- <powerjob.version>4.3.3</powerjob.version>
+ <spring-boot-admin.version>3.2.1</spring-boot-admin.version>
+ <redisson.version>3.25.2</redisson.version>
+ <lock4j.version>2.2.7</lock4j.version>
+ <dynamic-ds.version>4.3.0</dynamic-ds.version>
+ <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
+ <powerjob.version>4.3.6</powerjob.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.30</lombok.version>
@@ -44,9 +44,10 @@
<ip2region.version>2.7.0</ip2region.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.540</aws-java-sdk-s3.version>
+ <aws.sdk.version>2.23.0</aws.sdk.version>
+ <aws.crt.version>0.29.6</aws.crt.version>
<!-- SMS 閰嶇疆 -->
- <sms4j.version>2.2.0</sms4j.version>
+ <sms4j.version>3.1.1</sms4j.version>
<!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 -->
<fastjson.version>1.2.83</fastjson.version>
@@ -212,7 +213,7 @@
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -235,10 +236,23 @@
<version>${okhttp.version}</version>
</dependency>
+ <!-- AWS SDK for Java 2.x -->
<dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- <version>${aws-java-sdk-s3.version}</version>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3</artifactId>
+ <version>${aws.sdk.version}</version>
+ </dependency>
+ <!-- 浣跨敤AWS鍩轰簬 CRT 鐨� S3 瀹㈡埛绔� -->
+ <dependency>
+ <groupId>software.amazon.awssdk.crt</groupId>
+ <artifactId>aws-crt</artifactId>
+ <version>${aws.crt.version}</version>
+ </dependency>
+ <!-- 鍩轰簬 AWS CRT 鐨� S3 瀹㈡埛绔殑鎬ц兘澧炲己鐨� S3 浼犺緭绠＄悊鍣� -->
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3-transfer-manager</artifactId>
+ <version>${aws.sdk.version}</version>
</dependency>
<!--鐭俊sms4j-->
<dependency>
--
Gitblit v1.9.3