From 76ffdb89ad623a8c91c0c354b649efe9a744179f Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Tue, 10 Dec 2024 18:06:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=AD=BB=E4=BF=A1=E9=98=9F?=
 =?UTF-8?q?=E5=88=97=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/README.md                             | 128 +++++++++++++++++-
 backend/pom.xml                               |   7 +-
 .../workflow/config/FlowableConfig.java       |  20 +++
 .../workflow/delegate/ShellTaskDelegate.java  |  22 ++-
 .../impl/WorkflowDefinitionServiceImpl.java   |   1 +
 backend/src/main/resources/application.yml    |  15 ++
 6 files changed, 188 insertions(+), 5 deletions(-)

diff --git a/backend/README.md b/backend/README.md
index 276958cd..f5bad918 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -910,4 +910,130 @@ workflow_log（工作流日志表）
 提供了更丰富的元数据和状态信息
 支持更细粒度的日志记录
 可以存储自定义的业务数据
-这样的设计让我们可以在使用Flowable强大的工作流引擎的同时，也能满足特定的业务需求。
\ No newline at end of file
+这样的设计让我们可以在使用Flowable强大的工作流引擎的同时，也能满足特定的业务需求。
+
+
+{
+    "name": "Simple Shell Workflow6",
+    "key": "simple_shell_workflow",
+    "description": "A simple workflow with shell task",
+    "graphJson": {
+        "cells": [
+            {
+                "id": "start",
+                "shape": "start",
+                "data": {
+                    "label": "开始"
+                },
+                "position": {
+                    "x": 100,
+                    "y": 100
+                }
+            },
+            {
+                "id": "shell",
+                "shape": "serviceTask",
+                "data": {
+                    "label": "Shell脚本",
+                    "serviceTask": {
+                        "type": "shell",
+                        "implementation": "${shellTaskDelegate}",
+                        "fields": {
+                            "script": "timeout 10000000",
+                            "workDir": "/tmp",
+                            "env": {
+                                "TEST_VAR": "test_value"
+                            }
+                        }
+                    }
+                },
+                "position": {
+                    "x": 300,
+                    "y": 100
+                }
+            },
+            {
+                "id": "shellErrorBoundary",
+                "shape": "boundaryEvent",
+                "data": {
+                    "label": "Shell错误",
+                    "boundaryEvent": {
+                        "type": "error",
+                        "attachedToRef": "shell",
+                        "errorRef": "SHELL_EXECUTION_ERROR"
+                    }
+                },
+                "position": {
+                    "x": 300,
+                    "y": 160
+                }
+            },
+            {
+                "id": "errorHandler",
+                "shape": "serviceTask",
+                "data": {
+                    "label": "错误处理",
+                    "serviceTask": {
+                        "type": "service",
+                        "implementation": "${errorHandlerDelegate}"
+                    }
+                },
+                "position": {
+                    "x": 300,
+                    "y": 220
+                }
+            },
+            {
+                "id": "end",
+                "shape": "end",
+                "data": {
+                    "label": "结束"
+                },
+                "position": {
+                    "x": 500,
+                    "y": 100
+                }
+            },
+            {
+                "id": "flow1",
+                "shape": "edge",
+                "source": "start",
+                "target": "shell",
+                "data": {
+                    "label": "流转到Shell"
+                }
+            },
+            {
+                "id": "flow2",
+                "shape": "edge",
+                "source": "shell",
+                "target": "end",
+                "data": {
+                    "label": "完成"
+                }
+            },
+            {
+                "id": "flow_error",
+                "shape": "edge",
+                "source": "shellErrorBoundary",
+                "target": "errorHandler",
+                "data": {
+                    "label": "错误处理"
+                }
+            },
+            {
+                "id": "flow_error_end",
+                "shape": "edge",
+                "source": "errorHandler",
+                "target": "end",
+                "data": {
+                    "label": "处理完成"
+                }
+            }
+        ]
+    }
+}
+
+死信队列的问题：
+需要再异常里直接移除：
+runtimeService.deleteProcessInstance(processInstanceId, errorMessage);
\ No newline at end of file
diff --git a/backend/pom.xml b/backend/pom.xml
index 28ff6804..ac48ac2c 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -70,7 +70,7 @@
             <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
-        
+
         <!-- Hibernate Types -->
         <dependency>
             <groupId>com.vladmihalcea</groupId>
@@ -220,6 +220,11 @@
             <artifactId>flowable-bpmn-layout</artifactId>
             <version>${flowable.version}</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.flowable</groupId>-->
+<!--            <artifactId>flowable-spring-boot-starter-rest</artifactId>-->
+<!--            <version>${flowable.version}</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java
index 3e869b5d..eb6f1f39 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java
@@ -16,5 +16,25 @@ public class FlowableConfig implements EngineConfigurationConfigurer<SpringProce
         engineConfiguration.setLabelFontName("宋体");
         engineConfiguration.setAnnotationFontName("宋体");
         engineConfiguration.setDatabaseSchemaUpdate("true");
+        
+        // 配置异步执行器
+        engineConfiguration.setAsyncExecutorActivate(true);
+        // 设置重试次数为0，禁用重试
+//        engineConfiguration.setAsyncExecutorNumberOfRetries(0);
+        // 设置失败等待时间为最小值
+//        engineConfiguration.setAsyncFailedJobWaitTime(1);
+        
+//        // 配置异步执行器参数
+//        engineConfiguration.setAsyncExecutorDefaultAsyncJobAcquireWaitTime(1000);
+//        engineConfiguration.setAsyncExecutorDefaultTimerJobAcquireWaitTime(1000);
+//        engineConfiguration.setAsyncExecutorDefaultQueueSizeFullWaitTime(1000);
+//        engineConfiguration.setAsyncExecutorMaxAsyncJobsDuePerAcquisition(1);
+//        engineConfiguration.setAsyncExecutorMaxTimerJobsPerAcquisition(1);
+//
+//        // 禁用过期任务重置
+//        engineConfiguration.setAsyncExecutorResetExpiredJobsInterval(0);
+//
+//        // 禁用定义缓存
+//        engineConfiguration.setEnableProcessDefinitionInfoCache(false);
     }
 }
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/ShellTaskDelegate.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/ShellTaskDelegate.java
index 03199832..242b3e55 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/ShellTaskDelegate.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/ShellTaskDelegate.java
@@ -5,6 +5,7 @@ import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.flowable.common.engine.api.delegate.Expression;
 import org.flowable.engine.RuntimeService;
+import org.flowable.engine.ManagementService;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import jakarta.annotation.Resource;
@@ -29,6 +30,9 @@ public class ShellTaskDelegate implements JavaDelegate {
 
     @Resource
     private RuntimeService runtimeService;
+    
+    @Resource
+    private ManagementService managementService;
 
     private Expression script;
     private Expression workDir;
@@ -60,7 +64,8 @@ public class ShellTaskDelegate implements JavaDelegate {
         }
 
         if (scriptValue == null) {
-            throw new RuntimeException("Script is required but not provided");
+            handleFailure(execution, "Script is required but not provided");
+            return;
         }
 
         try {
@@ -173,7 +178,8 @@ public class ShellTaskDelegate implements JavaDelegate {
             if (exitCode != 0) {
                 log.error("Shell script execution failed with exit code: {}", exitCode);
                 log.error("Error output: {}", finalError);
-                throw new RuntimeException("Shell script execution failed with exit code: " + exitCode);
+                handleFailure(execution, "Shell script execution failed with exit code: " + exitCode);
+                return;
             }
 
             log.info("Shell script executed successfully");
@@ -181,7 +187,17 @@ public class ShellTaskDelegate implements JavaDelegate {
 
         } catch (Exception e) {
             log.error("Shell script execution failed", e);
-            throw new RuntimeException("Shell script execution failed: " + e.getMessage(), e);
+            handleFailure(execution, "Shell script execution failed: " + e.getMessage());
+        }
+    }
+
+    private void handleFailure(DelegateExecution execution, String errorMessage) {
+        String processInstanceId = execution.getProcessInstanceId();
+        try {
+            // 直接终止流程实例
+            runtimeService.deleteProcessInstance(processInstanceId, errorMessage);
+        } catch (Exception e) {
+            log.error("Error while handling shell task failure for process instance: {}", processInstanceId, e);
         }
     }
 }
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java
index 0199c1cd..105af45e 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java
@@ -104,6 +104,7 @@ public class WorkflowDefinitionServiceImpl extends BaseServiceImpl<WorkflowDefin
                 .businessKey(businessKey)
                 .variables(variables)
                 .startAsync();  // 异步启动，会自动执行 shell 任务
+//                .start();
 
             // 2. 返回实例信息
             WorkflowInstanceCreateDTO dto = new WorkflowInstanceCreateDTO();
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 87a98a71..cf56559a 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -30,8 +30,23 @@ spring:
     always-use-message-format: false
     use-code-as-default-message: true
     cache-duration: 3600
+flowable:
+  database-schema-update: true
+#  id-generator: org.flowable.common.engine.impl.db.DbIdGenerator
+#flowable:
+#  async-executor:
+#    default-async-job-acquire-wait-time: 60000
+#    default-timer-job-acquire-wait-time: 60000
+#    max-async-jobs-due-per-acquisition: 1
+#    retry-wait-time-in-millis: 60000
+#    number-of-retries: 1
+#    # 自动清理死信任务
+#    move-to-dead-letter-on-failure: true
+#    # 死信任务的保留时间（毫秒）
+#    dead-letter-timeout: 1000
 logging:
   level:
+    springframework: DEBUG
     org.springframework.web: DEBUG
     org.springframework.context.i18n: DEBUG
     org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping: TRACE