update warm-flow 1.2.4 => 1.2.7

This commit is contained in:
疯狂的狮子Li 2024-09-18 10:12:23 +08:00
parent 7430fa58bf
commit 71224b62a3
7 changed files with 17 additions and 31 deletions

View File

@ -51,7 +51,7 @@
<!-- 面向运行时的D-ORM依赖 -->
<anyline.version>8.7.2-20240808</anyline.version>
<!--工作流配置-->
<warm-flow>1.2.4</warm-flow>
<warm-flow.version>1.2.7</warm-flow.version>
<!-- 插件版本 -->
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
@ -122,9 +122,14 @@
<dependency>
<groupId>io.github.minliuhua</groupId>
<artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
<version>${warm-flow}</version>
<version>${warm-flow.version}</version>
</dependency>
<dependency>
<groupId>io.github.minliuhua</groupId>
<artifactId>warm-flow-plugin-spel</artifactId>
<version>${warm-flow.version}</version>
</dependency>
<!-- JustAuth 的依赖配置-->
<dependency>

View File

@ -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

View File

@ -65,10 +65,15 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>io.github.minliuhua</groupId>
<artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
</dependency>
<dependency>
<groupId>io.github.minliuhua</groupId>
<artifactId>warm-flow-plugin-spel</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -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;
}
}

View File

@ -126,7 +126,7 @@ public class FlowHisTaskVo implements Serializable {
/**
* 流程状态1审批中 2 审批通过 9已退回 10失效
*/
private Integer flowStatus;
private String flowStatus;
/**
* 流程状态

View File

@ -77,7 +77,7 @@ public class FlowInstanceVo {
/**
* 流程状态0待提交 1审批中 2 审批通过 3自动通过 8已完成 9已退回 10失效
*/
private Integer flowStatus;
private String flowStatus;
/**
* 流程状态

View File

@ -110,7 +110,7 @@ public class FlowTaskVo implements Serializable {
/**
* 流程状态
*/
private Integer flowStatus;
private String flowStatus;
/**
* 流程状态