opensource/RuoYi-Vue-Plus
2
0
Fork 2
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-11-04 06:15:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update Spring Boot 升级到 4.1.2

Browse Source 
update Spring Boot Admin 升级到 4.1.4
update Spring AI 升级到 2.0.2
update dynamic-ds 升级到 4.6.0
update Anyline 升级到 17.7.6-20261020
update Redisson 升级到 4.8.0
update Fesod 升级到 2.1.0-incubating
update Fory 升级到 1.7.7
update LiteFlow 升级到 2.16.3.1
This commit is contained in:
疯狂的狮子Li 2026-10-23 17:29:28 +08:00
parent c8be92b724
commit 2faac68665
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -20,17 +20,17 @@
<java.version>21</java.version> <java.version>21</java.version>
<!-- Spring 生态依赖版本 --> <!-- Spring 生态依赖版本 -->
<spring-boot.version>4.1.1</spring-boot.version> <spring-boot.version>4.1.2</spring-boot.version>
<spring-boot-admin.version>4.1.2</spring-boot-admin.version> <spring-boot-admin.version>4.1.4</spring-boot-admin.version>
<spring-ai.version>2.0.1</spring-ai.version> <spring-ai.version>2.0.2</spring-ai.version>
<springdoc.version>3.1.1</springdoc.version> <springdoc.version>3.1.1</springdoc.version>
<!-- 数据访问与持久化相关依赖版本 --> <!-- 数据访问与持久化相关依赖版本 -->
<mybatis.version>3.5.19</mybatis.version> <mybatis.version>3.5.19</mybatis.version>
<mybatis-plus.version>3.5.17</mybatis-plus.version> <mybatis-plus.version>3.5.17</mybatis-plus.version>
<mybatis-plus-join.version>1.5.9</mybatis-plus-join.version> <mybatis-plus-join.version>1.5.9</mybatis-plus-join.version>
<dynamic-ds.version>4.5.0</dynamic-ds.version> <dynamic-ds.version>4.6.0</dynamic-ds.version>
<anyline.version>8.7.3-20260306</anyline.version> <anyline.version>17.7.6-20261020</anyline.version>
<easy-es.version>3.0.2</easy-es.version> <easy-es.version>3.0.2</easy-es.version>
<elasticsearch-client.version>7.17.28</elasticsearch-client.version> <elasticsearch-client.version>7.17.28</elasticsearch-client.version>
@ -40,7 +40,7 @@
<bouncycastle.version>1.86</bouncycastle.version> <bouncycastle.version>1.86</bouncycastle.version>
<!-- 缓存、锁与任务调度相关依赖版本 --> <!-- 缓存、锁与任务调度相关依赖版本 -->
<redisson.version>4.7.0</redisson.version> <redisson.version>4.8.0</redisson.version>
<lock4j.version>2.2.7</lock4j.version> <lock4j.version>2.2.7</lock4j.version>
<snailjob.version>2.0.2</snailjob.version> <snailjob.version>2.0.2</snailjob.version>
<snailai.version>1.1.1</snailai.version> <snailai.version>1.1.1</snailai.version>
@ -51,8 +51,8 @@
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version> <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
<lombok.version>1.18.48</lombok.version> <lombok.version>1.18.48</lombok.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version> <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<fesod.version>2.0.2-incubating</fesod.version> <fesod.version>2.1.0-incubating</fesod.version>
<fory.version>1.7.4</fory.version> <fory.version>1.7.7</fory.version>
<!-- 三方集成与业务扩展相关依赖版本 --> <!-- 三方集成与业务扩展相关依赖版本 -->
<!-- 离线IP地址定位库 --> <!-- 离线IP地址定位库 -->
@ -63,7 +63,7 @@
<sms4j.version>3.3.5</sms4j.version> <sms4j.version>3.3.5</sms4j.version>
<!-- 工作流配置 --> <!-- 工作流配置 -->
<warm-flow.version>2.1.0</warm-flow.version> <warm-flow.version>2.1.0</warm-flow.version>
<liteflow.version>2.16.2.1</liteflow.version> <liteflow.version>2.16.3.1</liteflow.version>
<!-- mqtt客户端 --> <!-- mqtt客户端 -->
<mica-mqtt.version>2.6.12</mica-mqtt.version> <mica-mqtt.version>2.6.12</mica-mqtt.version>

4
ruoyi-admin/src/main/resources/application.yml
View File

@ -252,9 +252,7 @@ liteflow:
# 跟随工作流模块开关，避免禁用工作流时仍加载任务办理链 # 跟随工作流模块开关，避免禁用工作流时仍加载任务办理链
enable: ${warm-flow.enabled:true} enable: ${warm-flow.enabled:true}
metrics: metrics:
# 临时修复：LiteFlow 2.16.2.1 的 Actuator 端点与 Spring Boot 4.1 参数名校验不兼容 enabled: ${liteflow.enable:true}
# 待 LiteFlow 修复该问题后恢复为 ${liteflow.enable:true}
enabled: false
# 工作流模块用于编排任务办理链路 # 工作流模块用于编排任务办理链路
rule-source: classpath:liteflow/*.el.xml rule-source: classpath:liteflow/*.el.xml
# 开启虚拟线程 # 开启虚拟线程

6
ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
View File

@ -130,7 +130,7 @@ public class GenTableServiceImpl implements IGenTableService {
String tableName = genTable.getTableName(); String tableName = genTable.getTableName();
String tableComment = genTable.getTableComment(); String tableComment = genTable.getTableComment();
LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables(); Map<String, ? extends Table<?>> tablesMap = ServiceProxy.metadata().tables();
if (CollUtil.isEmpty(tablesMap)) { if (CollUtil.isEmpty(tablesMap)) {
return PageResult.build(); return PageResult.build();
} }
@ -195,13 +195,13 @@ public class GenTableServiceImpl implements IGenTableService {
@Override @Override
public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) { public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) {
Set<String> tableNameSet = new HashSet<>(List.of(tableNames)); Set<String> tableNameSet = new HashSet<>(List.of(tableNames));
LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables(); Map<String, ? extends Table<?>> tablesMap = ServiceProxy.metadata().tables();
if (CollUtil.isEmpty(tablesMap)) { if (CollUtil.isEmpty(tablesMap)) {
return new ArrayList<>(); return new ArrayList<>();
} }
List<Table<?>> tableList = tablesMap.values().stream() List<? extends Table<?>> tableList = tablesMap.values().stream()
.filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE)) .filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> tableNameSet.contains(x.getName())).toList(); .filter(x -> tableNameSet.contains(x.getName())).toList();