From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
pom.xml | 96 ++++++++++++++++++++++--------------------------
1 files changed, 44 insertions(+), 52 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3824322..4c37b04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,51 +13,49 @@
<description>鍏板疂杞﹂棿璐ㄩ噺绠＄悊绯荤粺</description>
<properties>
- <revision>5.2.2</revision>
- <spring-boot.version>3.2.9</spring-boot.version>
+ <revision>5.3.0</revision>
+ <spring-boot.version>3.4.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>
<mybatis.version>3.5.16</mybatis.version>
- <springdoc.version>2.6.0</springdoc.version>
+ <springdoc.version>2.8.4</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
- <easyexcel.version>4.0.2</easyexcel.version>
+ <easyexcel.version>4.0.3</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.38.0</satoken.version>
- <mybatis-plus.version>3.5.7</mybatis-plus.version>
+ <satoken.version>1.40.0</satoken.version>
+ <mybatis-plus.version>3.5.10</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.31</hutool.version>
- <okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>3.2.3</spring-boot-admin.version>
- <redisson.version>3.34.1</redisson.version>
+ <hutool.version>5.8.35</hutool.version>
+ <spring-boot-admin.version>3.4.1</spring-boot-admin.version>
+ <redisson.version>3.44.0</redisson.version>
<lock4j.version>2.2.7</lock4j.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>
+ <snailjob.version>1.3.0</snailjob.version>
+ <mapstruct-plus.version>1.4.6</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
- <lombok.version>1.18.34</lombok.version>
+ <lombok.version>1.18.36</lombok.version>
<bouncycastle.version>1.76</bouncycastle.version>
- <justauth.version>1.16.6</justauth.version>
+ <justauth.version>1.16.7</justauth.version>
<!-- 绂荤嚎IP鍦板潃瀹氫綅搴� -->
<ip2region.version>2.7.0</ip2region.version>
- <undertow.version>2.3.15.Final</undertow.version>
<!-- OSS 閰嶇疆 -->
- <aws.sdk.version>2.25.15</aws.sdk.version>
- <aws.crt.version>0.29.13</aws.crt.version>
+ <aws.sdk.version>2.28.22</aws.sdk.version>
+ <aws.crt.version>0.31.3</aws.crt.version>
<!-- SMS 閰嶇疆 -->
- <sms4j.version>3.3.2</sms4j.version>
+ <sms4j.version>3.3.3</sms4j.version>
<!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 -->
<fastjson.version>1.2.83</fastjson.version>
<!-- 闈㈠悜杩愯鏃剁殑D-ORM渚濊禆 -->
- <anyline.version>8.7.2-20240808</anyline.version>
+ <anyline.version>8.7.2-20250101</anyline.version>
<!--宸ヤ綔娴侀厤缃�-->
- <flowable.version>7.0.1</flowable.version>
+ <warm-flow.version>1.6.6</warm-flow.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-compiler-plugin.version>3.11.0</maven-compiler-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>
@@ -69,6 +67,8 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>info</logging.level>
+ <monitor.username>ruoyi</monitor.username>
+ <monitor.password>123456</monitor.password>
</properties>
</profile>
<profile>
@@ -77,6 +77,8 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>info</logging.level>
+ <monitor.username>ruoyi</monitor.username>
+ <monitor.password>123456</monitor.password>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -88,6 +90,8 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
+ <monitor.username>ruoyi</monitor.username>
+ <monitor.password>123456</monitor.password>
</properties>
</profile>
</profiles>
@@ -114,12 +118,16 @@
<scope>import</scope>
</dependency>
+ <!-- Warm-Flow鍥戒骇宸ヤ綔娴佸紩鎿�, 鍦ㄧ嚎鏂囨。锛歨ttp://warm-flow.cn/ -->
<dependency>
- <groupId>org.flowable</groupId>
- <artifactId>flowable-bom</artifactId>
- <version>${flowable.version}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.dromara.warm</groupId>
+ <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
+ <version>${warm-flow.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dromara.warm</groupId>
+ <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
+ <version>${warm-flow.version}</version>
</dependency>
<!-- JustAuth 鐨勪緷璧栭厤缃�-->
@@ -214,6 +222,12 @@
<dependency>
<groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-jsqlparser</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -223,12 +237,6 @@
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>${p6spy.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${okhttp.version}</version>
</dependency>
<!-- AWS SDK for Java 2.x -->
@@ -313,25 +321,9 @@
</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>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.15.0</version>
</dependency>
<dependency>
@@ -394,7 +386,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.verison}</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
--
Gitblit v1.9.3