From 71224b62a38a49eb73acb41331ffcfb1cb8a1536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 18 Sep 2024 10:12:23 +0800 Subject: [PATCH] update warm-flow 1.2.4 => 1.2.7 --- pom.xml | 9 +++++++-- ruoyi-admin/src/main/resources/application.yml | 18 ++---------------- ruoyi-modules/ruoyi-workflow/pom.xml | 5 +++++ .../workflow/config/WarmFlowConfig.java | 10 ---------- .../workflow/domain/vo/FlowHisTaskVo.java | 2 +- .../workflow/domain/vo/FlowInstanceVo.java | 2 +- .../dromara/workflow/domain/vo/FlowTaskVo.java | 2 +- 7 files changed, 17 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index c58c9a4e1..df198d0c4 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 8.7.2-20240808 - 1.2.4 + 1.2.7 3.2.2 @@ -122,9 +122,14 @@ io.github.minliuhua warm-flow-mybatis-plus-sb-starter - ${warm-flow} + ${warm-flow.version} + + io.github.minliuhua + warm-flow-plugin-spel + ${warm-flow.version} + diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 60c1873d9..bee3da50f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -273,19 +273,5 @@ websocket: --- # warm-flow工作流配置 warm-flow: - # 是否显示banner图，默认是 - banner: true - # 填充器 （可配置文件注入，也可用@Bean/@Component方式） - data-fill-handler-path: com.ruoyi.system.handle.CustomDataFillHandler - # 全局租户处理器（可配置文件注入，也可用@Bean/@Component方式） - tenant_handler_path: com.ruoyi.system.handle.CustomTenantHandler - # 是否开启逻辑删除 - logic_delete: false - # 逻辑删除字段值（开启后默认为2） - logic_delete_value: 2 - # 逻辑未删除字段（开启后默认为0） - logic_not_delete_value: 0 - # 数据源类型, mybatis模块对orm进一步的封装, 由于各数据库分页语句存在差异, - # 当配置此参数时, 以此参数结果为基准, 未配置时, 取DataSource中数据源类型, - # 兜底为mysql数据库 - data_source_type: mysql + # 是否开启工作流，默认true + enabled: true diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml index fb4e192e1..8ace150c0 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/ruoyi-modules/ruoyi-workflow/pom.xml @@ -65,10 +65,15 @@ org.dromara ruoyi-common-security + io.github.minliuhua warm-flow-mybatis-plus-sb-starter + + io.github.minliuhua + warm-flow-plugin-spel + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java index 6e663c00b..a38c83e27 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java @@ -1,10 +1,7 @@ package org.dromara.workflow.config; -import com.warm.flow.core.handler.TenantHandler; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.dromara.common.satoken.utils.LoginHelper; /** * warmFlow配置 @@ -14,12 +11,5 @@ import org.dromara.common.satoken.utils.LoginHelper; @Configuration public class WarmFlowConfig { - /** - * 全局租户处理器（可配置文件注入，也可用@Bean/@Component方式） - */ - @Bean - public TenantHandler tenantHandler() { - return LoginHelper::getTenantId; - } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java index f708b9796..c7dca17b9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java @@ -126,7 +126,7 @@ public class FlowHisTaskVo implements Serializable { /** * 流程状态（1审批中 2 审批通过 9已退回 10失效） */ - private Integer flowStatus; + private String flowStatus; /** * 流程状态 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java index d46637704..a8a85fb51 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java @@ -77,7 +77,7 @@ public class FlowInstanceVo { /** * 流程状态（0待提交 1审批中 2 审批通过 3自动通过 8已完成 9已退回 10失效） */ - private Integer flowStatus; + private String flowStatus; /** * 流程状态 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index 304a37ceb..9761f2d5b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -110,7 +110,7 @@ public class FlowTaskVo implements Serializable { /** * 流程状态 */ - private Integer flowStatus; + private String flowStatus; /** * 流程状态