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