Skip to content

Commit 015b406

Browse files
JavaLionLigitee-org
JavaLionLi
authored and
gitee-org
committed
!591 发布 5.2.3 正式版
Merge pull request !591 from 疯狂的狮子Li/dev
2 parents 098d334 + 6c950c9 commit 015b406

File tree

71 files changed

+580
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+580
-303
lines changed

‎.run/ruoyi-monitor-admin.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
33
<deployment type="dockerfile">
44
<settings>
5-
<option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.2.2" />
5+
<option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.2.3" />
66
<option name="buildOnly" value="true" />
77
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
88
</settings>

‎.run/ruoyi-server.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="演示机">
33
<deployment type="dockerfile">
44
<settings>
5-
<option name="imageTag" value="ruoyi/ruoyi-server:5.2.2" />
5+
<option name="imageTag" value="ruoyi/ruoyi-server:5.2.3" />
66
<option name="buildOnly" value="true" />
77
<option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
88
</settings>
99
</deployment>
1010
<method v="2" />
1111
</configuration>
12-
</component>
12+
</component>

‎.run/ruoyi-snailjob-server.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
33
<deployment type="dockerfile">
44
<settings>
5-
<option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.2.2" />
5+
<option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.2.3" />
66
<option name="buildOnly" value="true" />
77
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-snailjob-server/Dockerfile" />
88
</settings>

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE)
1010
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
1111
<br>
12-
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.2.2-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
12+
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.2.3-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
1313
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.2-blue.svg)]()
1414
[![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
1515
[![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]()

‎pom.xml

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,42 @@
1313
<description>RuoYi-Vue-Plus多租户管理系统</description>
1414

1515
<properties>
16-
<revision>5.2.2</revision>
17-
<spring-boot.version>3.2.9</spring-boot.version>
16+
<revision>5.2.3</revision>
17+
<spring-boot.version>3.2.11</spring-boot.version>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2020
<java.version>17</java.version>
2121
<mybatis.version>3.5.16</mybatis.version>
2222
<springdoc.version>2.6.0</springdoc.version>
2323
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
24-
<easyexcel.version>4.0.2</easyexcel.version>
24+
<easyexcel.version>4.0.3</easyexcel.version>
2525
<velocity.version>2.3</velocity.version>
26-
<satoken.version>1.38.0</satoken.version>
27-
<mybatis-plus.version>3.5.7</mybatis-plus.version>
26+
<satoken.version>1.39.0</satoken.version>
27+
<mybatis-plus.version>3.5.8</mybatis-plus.version>
2828
<p6spy.version>3.9.1</p6spy.version>
2929
<hutool.version>5.8.31</hutool.version>
30-
<okhttp.version>4.10.0</okhttp.version>
3130
<spring-boot-admin.version>3.2.3</spring-boot-admin.version>
32-
<redisson.version>3.34.1</redisson.version>
31+
<redisson.version>3.37.0</redisson.version>
3332
<lock4j.version>2.2.7</lock4j.version>
3433
<dynamic-ds.version>4.3.1</dynamic-ds.version>
3534
<snailjob.version>1.1.2</snailjob.version>
36-
<mapstruct-plus.version>1.4.4</mapstruct-plus.version>
35+
<mapstruct-plus.version>1.4.5</mapstruct-plus.version>
3736
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
3837
<lombok.version>1.18.34</lombok.version>
3938
<bouncycastle.version>1.76</bouncycastle.version>
4039
<justauth.version>1.16.6</justauth.version>
4140
<!-- 离线IP地址定位库 -->
4241
<ip2region.version>2.7.0</ip2region.version>
43-
<undertow.version>2.3.15.Final</undertow.version>
4442

4543
<!-- OSS 配置 -->
46-
<aws.sdk.version>2.25.15</aws.sdk.version>
47-
<aws.crt.version>0.29.13</aws.crt.version>
44+
<aws.sdk.version>2.28.22</aws.sdk.version>
45+
<aws.crt.version>0.31.3</aws.crt.version>
4846
<!-- SMS 配置 -->
49-
<sms4j.version>3.3.2</sms4j.version>
47+
<sms4j.version>3.3.3</sms4j.version>
5048
<!-- 限制框架中的fastjson版本 -->
5149
<fastjson.version>1.2.83</fastjson.version>
5250
<!-- 面向运行时的D-ORM依赖 -->
53-
<anyline.version>8.7.2-20240808</anyline.version>
51+
<anyline.version>8.7.2-20241022</anyline.version>
5452
<!--工作流配置-->
5553
<flowable.version>7.0.1</flowable.version>
5654

@@ -69,6 +67,8 @@
6967
<!-- 环境标识，需要与配置文件的名称相对应 -->
7068
<profiles.active>local</profiles.active>
7169
<logging.level>info</logging.level>
70+
<monitor.username>ruoyi</monitor.username>
71+
<monitor.password>123456</monitor.password>
7272
</properties>
7373
</profile>
7474
<profile>
@@ -77,6 +77,8 @@
7777
<!-- 环境标识，需要与配置文件的名称相对应 -->
7878
<profiles.active>dev</profiles.active>
7979
<logging.level>info</logging.level>
80+
<monitor.username>ruoyi</monitor.username>
81+
<monitor.password>123456</monitor.password>
8082
</properties>
8183
<activation>
8284
<!-- 默认环境 -->
@@ -88,6 +90,8 @@
8890
<properties>
8991
<profiles.active>prod</profiles.active>
9092
<logging.level>warn</logging.level>
93+
<monitor.username>ruoyi</monitor.username>
94+
<monitor.password>123456</monitor.password>
9195
</properties>
9296
</profile>
9397
</profiles>
@@ -225,12 +229,6 @@
225229
<version>${p6spy.version}</version>
226230
</dependency>
227231

228-
<dependency>
229-
<groupId>com.squareup.okhttp3</groupId>
230-
<artifactId>okhttp</artifactId>
231-
<version>${okhttp.version}</version>
232-
</dependency>
233-
234232
<!-- AWS SDK for Java 2.x -->
235233
<dependency>
236234
<groupId>software.amazon.awssdk</groupId>
@@ -313,25 +311,9 @@
313311
</dependency>
314312

315313
<dependency>
316-
<groupId>io.undertow</groupId>
317-
<artifactId>undertow-core</artifactId>
318-
<version>${undertow.version}</version>
319-
</dependency>
320-
<dependency>
321-
<groupId>io.undertow</groupId>
322-
<artifactId>undertow-servlet</artifactId>
323-
<version>${undertow.version}</version>
324-
</dependency>
325-
<dependency>
326-
<groupId>io.undertow</groupId>
327-
<artifactId>undertow-websockets-jsr</artifactId>
328-
<version>${undertow.version}</version>
329-
</dependency>
330-
331-
<dependency>
332-
<artifactId>commons-compress</artifactId>
333-
<groupId>org.apache.commons</groupId>
334-
<version>1.26.2</version>
314+
<groupId>commons-io</groupId>
315+
<artifactId>commons-io</artifactId>
316+
<version>2.15.0</version>
335317
</dependency>
336318

337319
<dependency>

‎ruoyi-admin/src/main/resources/application-dev.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ spring.boot.admin.client:
88
metadata:
99
username: ${spring.boot.admin.client.username}
1010
userpassword: ${spring.boot.admin.client.password}
11-
username: ruoyi
12-
password: 123456
11+
username: @monitor.username@
12+
password: @monitor.password@
1313

1414
--- # snail-job 配置
1515
snail-job:
@@ -25,6 +25,8 @@ snail-job:
2525
namespace: ${spring.profiles.active}
2626
# 随主应用端口飘逸
2727
port: 2${server.port}
28+
# 客户端ip指定
29+
host:
2830

2931
--- # 数据源配置
3032
spring:

‎ruoyi-admin/src/main/resources/application-prod.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ spring.boot.admin.client:
1111
metadata:
1212
username: ${spring.boot.admin.client.username}
1313
userpassword: ${spring.boot.admin.client.password}
14-
username: ruoyi
15-
password: 123456
14+
username: @monitor.username@
15+
password: @monitor.password@
1616

1717
--- # snail-job 配置
1818
snail-job:
@@ -28,6 +28,8 @@ snail-job:
2828
namespace: ${spring.profiles.active}
2929
# 随主应用端口飘逸
3030
port: 2${server.port}
31+
# 客户端ip指定
32+
host:
3133

3234
--- # 数据源配置
3335
spring:

‎ruoyi-admin/src/main/resources/application.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,10 @@ xss:
223223
# 过滤开关
224224
enabled: true
225225
# 排除链接（多个用逗号分隔）
226-
excludes: /system/notice
227-
# 匹配链接
228-
urlPatterns: /system/*,/monitor/*,/tool/*
226+
excludeUrls:
227+
- /system/notice
228+
- /workflow/model/save
229+
- /workflow/model/editModelXml
229230

230231
# 全局线程池相关配置
231232
# 如使用JDK21请直接使用虚拟线程 不要开启此配置

‎ruoyi-common/ruoyi-common-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</description>
1515

1616
<properties>
17-
<revision>5.2.2</revision>
17+
<revision>5.2.3</revision>
1818
</properties>
1919

2020
<dependencyManagement>

‎ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package org.dromara.common.core.exception;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Data;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.NoArgsConstructor;
7+
8+
import java.io.Serial;
9+
10+
/**
11+
* sse 特制异常
12+
*
13+
* @author LionLi
14+
*/
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
17+
@NoArgsConstructor
18+
@AllArgsConstructor
19+
public final class SseException extends RuntimeException {
20+
21+
@Serial
22+
private static final long serialVersionUID = 1L;
23+
24+
/**
25+
* 错误码
26+
*/
27+
private Integer code;
28+
29+
/**
30+
* 错误提示
31+
*/
32+
private String message;
33+
34+
/**
35+
* 错误明细，内部调试错误
36+
*/
37+
private String detailMessage;
38+
39+
public SseException(String message) {
40+
this.message = message;
41+
}
42+
43+
public SseException(String message, Integer code) {
44+
this.message = message;
45+
this.code = code;
46+
}
47+
48+
@Override
49+
public String getMessage() {
50+
return message;
51+
}
52+
53+
public SseException setMessage(String message) {
54+
this.message = message;
55+
return this;
56+
}
57+
58+
public SseException setDetailMessage(String detailMessage) {
59+
this.detailMessage = detailMessage;
60+
return this;
61+
}
62+
}

‎ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
import cn.hutool.core.lang.tree.TreeNodeConfig;
66
import cn.hutool.core.lang.tree.TreeUtil;
77
import cn.hutool.core.lang.tree.parser.NodeParser;
8-
import org.dromara.common.core.utils.reflect.ReflectUtils;
98
import lombok.AccessLevel;
109
import lombok.NoArgsConstructor;
10+
import org.dromara.common.core.utils.reflect.ReflectUtils;
1111

1212
import java.util.List;
13+
import java.util.stream.Collectors;
14+
import java.util.stream.Stream;
1315

1416
/**
1517
* 扩展 hutool TreeUtil 封装系统树构建
@@ -24,12 +26,54 @@ public class TreeBuildUtils extends TreeUtil {
2426
*/
2527
public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label");
2628

29+
/**
30+
* 构建树形结构
31+
*
32+
* @param <T> 输入节点的类型
33+
* @param <K> 节点ID的类型
34+
* @param list 节点列表，其中包含了要构建树形结构的所有节点
35+
* @param nodeParser 解析器，用于将输入节点转换为树节点
36+
* @return 构建好的树形结构列表
37+
*/
2738
public static <T, K> List<Tree<K>> build(List<T> list, NodeParser<T, K> nodeParser) {
2839
if (CollUtil.isEmpty(list)) {
29-
return null;
40+
return CollUtil.newArrayList();
3041
}
3142
K k = ReflectUtils.invokeGetter(list.get(0), "parentId");
3243
return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser);
3344
}
3445

46+
/**
47+
* 获取节点列表中所有节点的叶子节点
48+
*
49+
* @param <K> 节点ID的类型
50+
* @param nodes 节点列表
51+
* @return 包含所有叶子节点的列表
52+
*/
53+
public static <K> List<Tree<K>> getLeafNodes(List<Tree<K>> nodes) {
54+
if (CollUtil.isEmpty(nodes)) {
55+
return CollUtil.newArrayList();
56+
}
57+
return nodes.stream()
58+
.flatMap(TreeBuildUtils::extractLeafNodes)
59+
.collect(Collectors.toList());
60+
}
61+
62+
/**
63+
* 获取指定节点下的所有叶子节点
64+
*
65+
* @param <K> 节点ID的类型
66+
* @param node 要查找叶子节点的根节点
67+
* @return 包含所有叶子节点的列表
68+
*/
69+
private static <K> Stream<Tree<K>> extractLeafNodes(Tree<K> node) {
70+
if (!node.hasChild()) {
71+
return Stream.of(node);
72+
} else {
73+
// 递归调用，获取所有子节点的叶子节点
74+
return node.getChildren().stream()
75+
.flatMap(TreeBuildUtils::extractLeafNodes);
76+
}
77+
}
78+
3579
}

‎ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public final class RegexUtils extends ReUtil {
2121
*/
2222
public static String extractFromString(String input, String regex, String defaultInput) {
2323
try {
24-
return ReUtil.get(regex, input, 1);
24+
String str = ReUtil.get(regex, input, 1);
25+
return str == null ? defaultInput : str;
2526
} catch (Exception e) {
2627
return defaultInput;
2728
}

‎ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class SqlUtil {
1515
/**
1616
* 定义常用的 sql关键字
1717
*/
18-
public static final String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare ";
18+
public static String SQL_REGEX = "and |extractvalue|updatexml|sleep|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()";
1919

2020
/**
2121
* 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）

0 commit comments

Comments
 (0)