From 9318f182b0a226d1a55d5989e37f037d1b87c910 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 17 八月 2024 10:10:51 +0800
Subject: [PATCH] reset 回滚 修改spring源码上下文持有者(存在数据未清理内存泄漏问题)
---
pom.xml | 179 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 108 insertions(+), 71 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c44229..7772834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,49 +13,53 @@
<description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.1.0-SNAPSHOT</revision>
- <spring-boot.version>3.0.7</spring-boot.version>
+ <revision>5.2.1</revision>
+ <spring-boot.version>3.2.8</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>
- <springdoc.version>2.1.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.2.1</easyexcel.version>
+ <easyexcel.version>4.0.2</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.34.0</satoken.version>
- <mybatis-plus.version>3.5.3.1</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.18</hutool.version>
+ <hutool.version>5.8.31</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>
- <lock4j.version>2.2.4</lock4j.version>
- <dynamic-ds.version>3.6.1</dynamic-ds.version>
- <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
- <powerjob.version>4.3.3</powerjob.version>
- <mapstruct-plus.version>1.2.3</mapstruct-plus.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.1</dynamic-ds.version>
+ <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
+ <snailjob.version>1.1.1</snailjob.version>
+ <mapstruct-plus.version>1.4.3</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>
- <justauth.version>1.16.5</justauth.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>
-
- <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
- <snakeyaml.version>1.33</snakeyaml.version>
+ <undertow.version>2.3.15.Final</undertow.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
+ <aws.sdk.version>2.25.15</aws.sdk.version>
+ <aws.crt.version>0.29.13</aws.crt.version>
<!-- SMS 閰嶇疆 -->
- <sms4j.version>2.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>
<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>
@@ -65,7 +69,7 @@
<properties>
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
- <logging.level>debug</logging.level>
+ <logging.level>info</logging.level>
</properties>
</profile>
<profile>
@@ -73,7 +77,7 @@
<properties>
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
- <logging.level>debug</logging.level>
+ <logging.level>info</logging.level>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -107,6 +111,14 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-bom</artifactId>
<version>${hutool.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.flowable</groupId>
+ <artifactId>flowable-bom</artifactId>
+ <version>${flowable.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -146,25 +158,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浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -201,19 +197,19 @@
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>${dynamic-ds.version}</version>
</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>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -236,10 +232,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>
@@ -272,18 +281,22 @@
<version>${lock4j.version}</version>
</dependency>
+ <!-- SnailJob Client -->
+ <dependency>
+ <groupId>com.aizuda</groupId>
+ <artifactId>snail-job-client-starter</artifactId>
+ <version>${snailjob.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.aizuda</groupId>
+ <artifactId>snail-job-client-job-core</artifactId>
+ <version>${snailjob.version}</version>
+ </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>${alibaba-ttl.version}</version>
- </dependency>
-
- <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
</dependency>
<!-- 鍔犲瘑鍖呭紩鍏� -->
@@ -304,6 +317,34 @@
<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>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
</dependency>
<dependency>
@@ -330,16 +371,11 @@
<version>${revision}</version>
</dependency>
- <!-- PowerJob -->
+ <!-- 宸ヤ綔娴佹ā鍧� -->
<dependency>
- <groupId>tech.powerjob</groupId>
- <artifactId>powerjob-worker-spring-boot-starter</artifactId>
- <version>${powerjob.version}</version>
- </dependency>
- <dependency>
- <groupId>tech.powerjob</groupId>
- <artifactId>powerjob-official-processors</artifactId>
- <version>${powerjob.version}</version>
+ <groupId>org.dromara</groupId>
+ <artifactId>ruoyi-workflow</artifactId>
+ <version>${revision}</version>
</dependency>
</dependencies>
@@ -401,6 +437,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
<!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
<groups>${profiles.active}</groups>
<!-- 鎺掗櫎鏍囩 -->
@@ -457,8 +494,8 @@
<repositories>
<repository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -468,8 +505,8 @@
<pluginRepositories>
<pluginRepository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
--
Gitblit v1.9.3