From a8b0935a995c20c8379b61fd458e9ed8c6e72308 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 13 May 2024 10:03:17 +0800
Subject: [PATCH] =?UTF-8?q?update(REQ-2324):=20=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81,=E5=87=8F=E5=B0=91=E5=A4=9A=E5=B1=82=20ifelse=20?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApproveErrorReporterEventListener.java    | 37 ++++++++++---------
 .../src/main/resources/bootstrap.yml          | 13 +++++++
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ApproveErrorReporterEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ApproveErrorReporterEventListener.java
index d02bb91b2..d2cfac555 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ApproveErrorReporterEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ApproveErrorReporterEventListener.java
@@ -58,23 +58,26 @@ public class ApproveErrorReporterEventListener implements BpmnAsyncJobEventListe
         JobInfo jobInfo = (JobInfo) jobEvent.getEntity();
         String handlerType = jobInfo.getJobHandlerType();
         //只处理审批类型任务
-        if (AsyncApproveTaskJobHandler.TYPE.equals(handlerType)) {
-            Throwable throwable = jobEvent.getCause();
-            if (StringUtils.isNoneBlank(jobInfo.getCustomValues())) {
-                BpmnTaskAuditDTO dto = JSONUtil.toBean(jobInfo.getCustomValues(), BpmnTaskAuditDTO.class);
-                WorkflowEngineException exception = (WorkflowEngineException) (throwable);
-                if (!IGNORE_ERROR_CODES.contains(exception.getCode())) {
-                    Process process = ProcessDefinitionUtil.getProcess(((FlowableEntityExceptionEventImpl) flowableEvent).getProcessDefinitionId());
-                    //获取消息配置
-                    Optional<BpmnNoticeConf> noticeConfig = BpmnMetaParserHelper.getNoticeConfig(process);
-                    ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration();
-                    FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher();
-                    MessagePushEvent event = MessagePushEventBuilder.createPendingRollbackEvent(jobEvent.getProcessInstanceId(), jobInfo.getTenantId(), dto.getTaskId(), noticeConfig.orElse(new BpmnNoticeConf()));
-                    log.info("发送恢复待办的流程事件消息: taskDto:{},event:{}", JSONUtil.toJsonStr(dto), JSONUtil.toJsonStr(event));
-                    eventDispatcher.dispatchEvent(event, processEngineConfiguration.getEngineCfgKey());
-                }
-            } else {
-                log.warn("审批类型错误,CustomValues内容为空,event:{}", jobEvent);
+        if (!AsyncApproveTaskJobHandler.TYPE.equals(handlerType)) {
+            return;
+        }
+        if (StringUtils.isBlank(jobInfo.getCustomValues())) {
+            log.warn("审批类型错误,CustomValues内容为空,event:{}", jobEvent);
+            return;
+        }
+
+        BpmnTaskAuditDTO dto = JSONUtil.toBean(jobInfo.getCustomValues(), BpmnTaskAuditDTO.class);
+        if (jobEvent.getCause() instanceof WorkflowEngineException) {
+            WorkflowEngineException exception = (WorkflowEngineException) jobEvent.getCause();
+            if (!IGNORE_ERROR_CODES.contains(exception.getCode())) {
+                Process process = ProcessDefinitionUtil.getProcess(((FlowableEntityExceptionEventImpl) flowableEvent).getProcessDefinitionId());
+                //获取消息配置
+                Optional<BpmnNoticeConf> noticeConfig = BpmnMetaParserHelper.getNoticeConfig(process);
+                ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration();
+                FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher();
+                MessagePushEvent event = MessagePushEventBuilder.createPendingRollbackEvent(jobEvent.getProcessInstanceId(), jobInfo.getTenantId(), dto.getTaskId(), noticeConfig.orElse(new BpmnNoticeConf()));
+                log.info("发送恢复待办的流程事件消息: taskDto:{},event:{}", JSONUtil.toJsonStr(dto), JSONUtil.toJsonStr(event));
+                eventDispatcher.dispatchEvent(event, processEngineConfiguration.getEngineCfgKey());
             }
         }
     }
diff --git a/workflow-engine-server/src/main/resources/bootstrap.yml b/workflow-engine-server/src/main/resources/bootstrap.yml
index 451a44f92..ada47bc8a 100644
--- a/workflow-engine-server/src/main/resources/bootstrap.yml
+++ b/workflow-engine-server/src/main/resources/bootstrap.yml
@@ -72,3 +72,16 @@ spring:
         server-addr: ${NACOS_HOST:https://pre-nacos.axzo.cn}:${NACOS_PORT:443}
         file-extension: yaml
         namespace: ${NACOS_NAMESPACE_ID:8b4cf725-7595-4c92-b2a6-9260a51ce078}
+
+---
+#预发布环境
+spring:
+  config:
+    activate:
+      on-profile: live
+  cloud:
+    nacos:
+      config:
+        server-addr: ${NACOS_HOST:https://live-nacos.axzo.cn}:${NACOS_PORT:443}
+        file-extension: yaml
+        namespace: ${NACOS_NAMESPACE_ID:64faf030-7112-45c3-9f06-a40571f685c2}