From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev
---
pom.xml | 109 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba9ced2..750673b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,43 +13,46 @@
<description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.2.0-SNAPSHOT</revision>
- <spring-boot.version>3.2.3</spring-boot.version>
+ <revision>5.2.2</revision>
+ <spring-boot.version>3.2.9</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.3</spring-boot.mybatis>
- <springdoc.version>2.3.0</springdoc.version>
+ <mybatis.version>3.5.16</mybatis.version>
+ <springdoc.version>2.6.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
- <poi.version>5.2.3</poi.version>
- <easyexcel.version>3.3.3</easyexcel.version>
+ <easyexcel.version>4.0.2</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.37.0</satoken.version>
- <mybatis-plus.version>3.5.5</mybatis-plus.version>
+ <satoken.version>1.38.0</satoken.version>
+ <mybatis-plus.version>3.5.7</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.26</hutool.version>
+ <hutool.version>5.8.31</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>3.2.2</spring-boot-admin.version>
- <redisson.version>3.27.0</redisson.version>
+ <spring-boot-admin.version>3.2.3</spring-boot-admin.version>
+ <redisson.version>3.34.1</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.6</mapstruct-plus.version>
+ <dynamic-ds.version>4.3.1</dynamic-ds.version>
+ <snailjob.version>1.1.2</snailjob.version>
+ <mapstruct-plus.version>1.4.4</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
- <lombok.version>1.18.30</lombok.version>
+ <lombok.version>1.18.34</lombok.version>
<bouncycastle.version>1.76</bouncycastle.version>
<justauth.version>1.16.6</justauth.version>
<!-- 绂荤嚎IP鍦板潃瀹氫綅搴� -->
<ip2region.version>2.7.0</ip2region.version>
+ <undertow.version>2.3.15.Final</undertow.version>
<!-- OSS 閰嶇疆 -->
- <aws.sdk.version>2.23.0</aws.sdk.version>
- <aws.crt.version>0.29.6</aws.crt.version>
+ <aws.sdk.version>2.25.15</aws.sdk.version>
+ <aws.crt.version>0.29.13</aws.crt.version>
<!-- SMS 閰嶇疆 -->
- <sms4j.version>3.1.1</sms4j.version>
+ <sms4j.version>3.3.2</sms4j.version>
<!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 -->
<fastjson.version>1.2.83</fastjson.version>
+ <!-- 闈㈠悜杩愯鏃剁殑D-ORM渚濊禆 -->
+ <anyline.version>8.7.2-20240808</anyline.version>
+ <!--宸ヤ綔娴侀厤缃�-->
+ <flowable.version>7.0.1</flowable.version>
<!-- 鎻掍欢鐗堟湰 -->
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
@@ -57,9 +60,6 @@
<maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
-
- <!--宸ヤ綔娴侀厤缃�-->
- <flowable.version>7.0.0</flowable.version>
</properties>
<profiles>
@@ -157,25 +157,9 @@
</dependency>
<dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${poi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
- </dependency>
- <dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -217,9 +201,9 @@
</dependency>
<dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${spring-boot.mybatis}</version>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ <version>${mybatis.version}</version>
</dependency>
<dependency>
@@ -296,22 +280,16 @@
<version>${lock4j.version}</version>
</dependency>
- <!-- PowerJob -->
+ <!-- SnailJob Client -->
<dependency>
- <groupId>tech.powerjob</groupId>
- <artifactId>powerjob-worker-spring-boot-starter</artifactId>
- <version>${powerjob.version}</version>
+ <groupId>com.aizuda</groupId>
+ <artifactId>snail-job-client-starter</artifactId>
+ <version>${snailjob.version}</version>
</dependency>
<dependency>
- <groupId>tech.powerjob</groupId>
- <artifactId>powerjob-official-processors</artifactId>
- <version>${powerjob.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>transmittable-thread-local</artifactId>
- <version>${alibaba-ttl.version}</version>
+ <groupId>com.aizuda</groupId>
+ <artifactId>snail-job-client-job-core</artifactId>
+ <version>${snailjob.version}</version>
</dependency>
<!-- 鍔犲瘑鍖呭紩鍏� -->
@@ -332,6 +310,28 @@
<groupId>org.lionsoul</groupId>
<artifactId>ip2region</artifactId>
<version>${ip2region.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ <version>${undertow.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-servlet</artifactId>
+ <version>${undertow.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-websockets-jsr</artifactId>
+ <version>${undertow.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>commons-compress</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <version>1.26.2</version>
</dependency>
<dependency>
@@ -430,6 +430,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
<!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
<groups>${profiles.active}</groups>
<!-- 鎺掗櫎鏍囩 -->
--
Gitblit v1.9.3