From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:19:28 +0800
Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev
---
pom.xml | 105 ++++++++++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 57 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9a39bb8..1d4366f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,55 +10,52 @@
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/dromara/RuoYi-Vue-Plus</url>
- <description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
+ <description>Dromara RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.2.1</revision>
- <spring-boot.version>3.2.8</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>
- <poi.version>5.2.3</poi.version>
- <easyexcel.version>3.3.4</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.29</hutool.version>
- <okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>3.2.3</spring-boot-admin.version>
- <redisson.version>3.33.0</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>
- <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
- <snailjob.version>1.1.0</snailjob.version>
- <mapstruct-plus.version>1.3.6</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.32</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>
<!-- 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.2.1</sms4j.version>
+ <sms4j.version>3.3.3</sms4j.version>
<!-- 闄愬埗妗嗘灦涓殑fastjson鐗堟湰 -->
<fastjson.version>1.2.83</fastjson.version>
<!-- 闈㈠悜杩愯鏃剁殑D-ORM渚濊禆 -->
- <anyline.version>8.7.2-20240722</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>
@@ -70,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>
@@ -78,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>
<!-- 榛樿鐜 -->
@@ -89,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>
@@ -115,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 鐨勪緷璧栭厤缃�-->
@@ -158,25 +165,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浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -231,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>
@@ -240,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 -->
@@ -309,12 +300,6 @@
<version>${snailjob.version}</version>
</dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>transmittable-thread-local</artifactId>
- <version>${alibaba-ttl.version}</version>
- </dependency>
-
<!-- 鍔犲瘑鍖呭紩鍏� -->
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -333,6 +318,12 @@
<groupId>org.lionsoul</groupId>
<artifactId>ip2region</artifactId>
<version>${ip2region.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.15.0</version>
</dependency>
<dependency>
@@ -388,7 +379,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