handleForestException(FlowException e, HttpServletRequest request) {
- String requestURI = request.getRequestURI();
- log.error("请求地址'{}',流程异常.{}", requestURI, e.getMessage());
- return R.fail(HttpStatus.HTTP_UNAVAILABLE, e.getMessage());
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-workflow/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-workflow/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index a6da7ff44..000000000
--- a/ruoyi-common/ruoyi-common-workflow/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-org.dromara.common.workflow.config.WorkflowConfiguration
diff --git a/ruoyi-common/ruoyi-common-workflow/src/main/resources/common-workflow.yml b/ruoyi-common/ruoyi-common-workflow/src/main/resources/common-workflow.yml
deleted file mode 100644
index dfeb7e9cf..000000000
--- a/ruoyi-common/ruoyi-common-workflow/src/main/resources/common-workflow.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# warm-flow工作流配置
-warm-flow:
- # 是否开启工作流,默认true
- enabled: true
- # 是否显示banner图,默认是
- banner: true
- # 是否开启设计器ui,默认true
- ui: true
diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml
index 1dd4662ca..6e18f8680 100644
--- a/ruoyi-modules/ruoyi-workflow/pom.xml
+++ b/ruoyi-modules/ruoyi-workflow/pom.xml
@@ -37,45 +37,46 @@
org.dromara
ruoyi-common-mybatis
-
org.dromara
ruoyi-common-web
-
org.dromara
ruoyi-common-log
-
org.dromara
ruoyi-common-idempotent
-
org.dromara
ruoyi-common-excel
-
org.dromara
ruoyi-common-translation
-
org.dromara
ruoyi-common-tenant
-
org.dromara
ruoyi-common-security
- org.dromara
- ruoyi-common-workflow
+ io.github.minliuhua
+ warm-flow-mybatis-plus-sb-starter
+
+
+ io.github.minliuhua
+ warm-flow-plugin-spel
+
+
+ io.github.minliuhua
+ warm-flow-plugin-ui-sb-web
diff --git a/ruoyi-common/ruoyi-common-workflow/src/main/java/org/dromara/common/workflow/enums/TaskAssigneeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-workflow/src/main/java/org/dromara/common/workflow/enums/TaskAssigneeEnum.java
rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java
index 03a37b40f..42971c624 100644
--- a/ruoyi-common/ruoyi-common-workflow/src/main/java/org/dromara/common/workflow/enums/TaskAssigneeEnum.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java
@@ -1,4 +1,4 @@
-package org.dromara.common.workflow.enums;
+package org.dromara.workflow.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -81,7 +81,7 @@ public enum TaskAssigneeEnum {
/**
* 获取所有办理人类型的描述列表
*
- * 获取当前枚举类所有项的描述字段列表,通常用于展示选择项
+ * 获取当前枚举类所有项的描述字段列表,通常用于展示选择项。
*
*
* @return List 返回所有办理人类型的描述列表
@@ -95,7 +95,7 @@ public enum TaskAssigneeEnum {
/**
* 获取所有办理人类型的代码列表
*
- * 获取当前枚举类所有项的代码字段列表,通常用于程序内部逻辑的判断
+ * 获取当前枚举类所有项的代码字段列表,通常用于程序内部逻辑的判断。
*
*
* @return List 返回所有办理人类型的代码列表
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
new file mode 100644
index 000000000..a38c83e27
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java
@@ -0,0 +1,15 @@
+package org.dromara.workflow.config;
+
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * warmFlow配置
+ *
+ * @author may
+ */
+@Configuration
+public class WarmFlowConfig {
+
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java
index 95af5891a..f9d5e24a6 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java
@@ -20,7 +20,7 @@ import org.dromara.common.core.service.RoleService;
import org.dromara.common.core.service.UserService;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.workflow.enums.TaskAssigneeEnum;
+import org.dromara.workflow.common.enums.TaskAssigneeEnum;
import org.dromara.workflow.service.IWfTaskAssigneeService;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
index 26b22ff75..741f94e4f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
@@ -10,7 +10,7 @@ import org.dromara.common.core.domain.dto.UserDTO;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.common.workflow.enums.TaskAssigneeEnum;
+import org.dromara.workflow.common.enums.TaskAssigneeEnum;
import org.dromara.workflow.service.IWfTaskAssigneeService;
import java.util.HashSet;