From aba60920c8d516f8a6ac5086eac8e5d8b27bfa88 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 8 Aug 2024 10:45:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=20-=20=E8=B0=83=E6=95=B4=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E8=BF=87=E5=AE=A1=E5=8D=A1?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=AF=BC=E8=87=B4MQ=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=8F=91=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/CustomRetryInterceptor.java | 2 +- .../listener/AutoPassTransactionListener.java | 2 +- .../AutoRejectTransactionListener.java | 2 +- .../task/AutoOperatorEvent_101_Listener.java | 22 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/interceptor/CustomRetryInterceptor.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/interceptor/CustomRetryInterceptor.java index e48493113..b2f1179cd 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/interceptor/CustomRetryInterceptor.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/interceptor/CustomRetryInterceptor.java @@ -38,7 +38,7 @@ public class CustomRetryInterceptor extends AbstractCommandInterceptor { try { // try to execute the command - log.info("assignableFrom result: {}", AbstractCommand.class.isAssignableFrom(command.getClass())); + log.debug("assignableFrom result: {}", AbstractCommand.class.isAssignableFrom(command.getClass())); if (AbstractCommand.class.isAssignableFrom(command.getClass())) { // 如果在以后,重试三次也不能解决的话, 可以利用这里的拿到的参数,重新自动构造CMD,并执行. log.info("Executing command params: {} traceId:{} ", TraceUtil.traceId(), diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoPassTransactionListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoPassTransactionListener.java index bb43b8ac7..a2798cf58 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoPassTransactionListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoPassTransactionListener.java @@ -43,7 +43,7 @@ public class AutoPassTransactionListener implements TransactionListener { log.info("exec auto pass transaction listener start, processInstanceId: {}, taskId: {}", delegateTask.getProcessInstanceId(), delegateTask.getId()); // 必须开启新的事务 - CommandConfig commandConfig = new CommandConfig(false, TransactionPropagation.REQUIRES_NEW); + CommandConfig commandConfig = new CommandConfig(false, TransactionPropagation.REQUIRED); CommandExecutor commandExecutor = commandContext.getCommandExecutor(); BpmnTaskDelegateAssigner assigner = BpmnTaskDelegateAssigner.toObjectCompatible(commandExecutor.execute(getVariableCmd())); commandExecutor.execute(commandConfig, new CustomApproveTaskCmd(delegateTask.getId(), advice, "自动通过", diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoRejectTransactionListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoRejectTransactionListener.java index ac05879be..b1235b28e 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoRejectTransactionListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/tx/listener/AutoRejectTransactionListener.java @@ -35,7 +35,7 @@ public class AutoRejectTransactionListener implements TransactionListener { delegateTask.getProcessInstanceId(), delegateTask.getId()); // 必须开启新的事务 - CommandConfig commandConfig = new CommandConfig(false, TransactionPropagation.REQUIRES_NEW); + CommandConfig commandConfig = new CommandConfig(false, TransactionPropagation.REQUIRED); BpmnTaskAuditDTO taskAudit = new BpmnTaskAuditDTO(); taskAudit.setTaskId(delegateTask.getId()); taskAudit.setApprover(new BpmnTaskDelegateAssigner("系统", "system", delegateTask.getTenantId())); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java index 4d49b91ed..01f85f8f8 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java @@ -85,7 +85,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener { switch (approverEmptyHandleTypeEnum) { case autoPassed: - autoPass(delegateTask); + autoPass(delegateTask, TransactionState.COMMITTING); break; case autoRejection: - autoReject(delegateTask); + autoReject(delegateTask, TransactionState.COMMITTING); break; case autoSkipped: // autoReject(delegateTask); @@ -165,10 +165,10 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener { switch (approvalMethodEnum) { case autoPassed: - autoPass(delegateTask); + autoPass(delegateTask, TransactionState.COMMITTING); break; case autoRejection: - autoReject(delegateTask); + autoReject(delegateTask, TransactionState.COMMITTING); break; case bizSpecify: break; @@ -186,8 +186,8 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener