From e6498c130bbdbce36964c72d2c5b6215b30c9dda Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sun, 28 Apr 2024 14:59:58 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BC=98=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EngineExecutionStartListener.java | 9 ++-- .../EngineProcessInstanceEventListener.java | 4 +- ...nternalExtAxTaskInstEvent_lo_Listener.java | 4 +- .../RocketMqBpmActivityEventListener.java | 32 +++--------- .../RocketMqMessagePushEventListener.java | 52 +++++-------------- .../MessagePushProcessEventListener.java | 40 ++++---------- .../RocketMqBpmnProcessEventListener.java | 49 +++++------------ .../task/AutoOperatorEvent_101_Listener.java | 16 ++---- .../MessagePushTaskEvent_103_Listener.java | 24 +++------ .../RocketMqBpmnTaskEvent_102_Listener.java | 32 +++--------- ...napshotBpmnTaskTaskEvent_100_Listener.java | 8 +-- .../initializer/ExtDatabaseInitializer.java | 4 +- .../VersionUpgradeInitializer.java | 2 +- 13 files changed, 71 insertions(+), 205 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java index 4599fbaa3..22dd618aa 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java @@ -139,10 +139,9 @@ public class EngineExecutionStartListener implements ExecutionListener { // 这里只会是 human 这一种情况， 因为 nobody 在转 BPMN 协议时，Activity 直接变成了 ReceiveTask 节点了。 List assigners = new ArrayList<>(); getApproverSpecify(userTask).ifPresent(specify -> { - if (log.isDebugEnabled()) { - log.debug("当前审批节点ID: {}, 节点名称: {}, 审批人指定方式: {}", userTask.getId(), + log.info("当前审批节点ID: {}, 节点名称: {}, 审批人指定方式: {}", userTask.getId(), userTask.getName(), specify.getDesc()); - } + assigners.addAll(approverSelect(specify.getType(), userTask, execution, true)); }); @@ -235,9 +234,7 @@ public class EngineExecutionStartListener implements ExecutionListener { */ if ((mock && global) || (mock && !global && Objects.equals(category, execution.getProcessDefinitionId().split(":")[0]))) { - if (log.isDebugEnabled()) { - log.debug("当前系统 Nacos 配置中开启了 mock: {}, 将使用 mock 方式查找审批人", mock); - } + log.info("当前系统 Nacos 配置中开启了 mock: {}, 将使用 mock 方式查找审批人", mock); assigners.addAll(new MockTaskAssigneeSelector(assigneeMap, global, category) .select(flowElement, execution, throwException)); } else { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java index fd80307cd..3a1f52fbf 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java @@ -148,9 +148,7 @@ public class EngineProcessInstanceEventListener extends AbstractFlowableEngineEv MessagePushEventImpl messagePushEvent = MessagePushEventBuilder.createEvent(MessagePushEventType.NOTICE, Lists.newArrayList(assigner), noticeConfig.orElse(null), processInstance.getProcessInstanceId(), processInstance.getTenantId(), null); - if (log.isDebugEnabled()) { - log.debug("发送站内信: {}", JSONUtil.toJsonStr(messagePushEvent)); - } + log.info("发送站内信: {}", JSONUtil.toJsonStr(messagePushEvent)); eventDispatcher.dispatchEvent(messagePushEvent, processEngineConfiguration.getEngineCfgKey()); } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java index 0df4cbf59..3f6231142 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_lo_Listener.java @@ -71,9 +71,7 @@ public class InternalExtAxTaskInstEvent_lo_Listener extends AbstractBpmnEventLis @Override public void onDeleted(DelegateTask delegateTask) { Object operationType = delegateTask.getTransientVariable(TASK_COMPLETE_OPERATION_TYPE + delegateTask.getId()); - if (log.isDebugEnabled()) { - log.debug("taskId:{}, operationType:{}", delegateTask.getId(), operationType); - } + log.info("taskId:{}, operationType:{}", delegateTask.getId(), operationType); // 多实例或签同意时,无法正确区分状态, 所以默认认为这种是无需展示在日志中的 BpmnProcessInstanceResultEnum resultEnum = DELETED; diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java index 6bc8e5f5a..4eb134156 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java @@ -64,23 +64,17 @@ public class RocketMqBpmActivityEventListener extends AbstractBpmnEventListener< @Override public void onStart(DelegateExecution execution) { - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onStart...activityId: {}", execution.getCurrentActivityId()); - } + log.info("RocketMqBpmActivityEventListener#onStart...activityId: {}", execution.getCurrentActivityId()); ProcessActivityDTO dto = build(PROCESS_ACTIVITY_START, execution); sendMessageQueue(dto, PROCESS_ACTIVITY_START); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onStart...end, activityId: {}", + log.info("RocketMqBpmActivityEventListener#onStart...end, activityId: {}", execution.getCurrentActivityId()); - } } @Override public void onWaitAssignee(BizSpecifyAssigneeEvent event) { - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onWaitAssignee...activityId: {}", event.getActivityId()); - } + log.info("RocketMqBpmActivityEventListener#onWaitAssignee...activityId: {}", event.getActivityId()); // 特殊的自定义业务事件, 不能使用公共的 build 方法 ProcessActivityDTO dto = new ProcessActivityDTO(); dto.setType(PROCESS_ACTIVITY_WAIT_ASSIGNEE); @@ -102,43 +96,33 @@ public class RocketMqBpmActivityEventListener extends AbstractBpmnEventListener< } dto.setWorkflowEngineVersion(version); sendMessageQueue(dto, PROCESS_ACTIVITY_WAIT_ASSIGNEE); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onWaitAssignee...end, activityId: {}", event.getActivityId()); - } + log.info("RocketMqBpmActivityEventListener#onWaitAssignee...end, activityId: {}", event.getActivityId()); } @Override public void onTake(DelegateExecution execution) { - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onTake...activityId: {}", + log.info("RocketMqBpmActivityEventListener#onTake...activityId: {}", execution.getCurrentActivityId()); - } ProcessActivityDTO dto = build(PROCESS_ACTIVITY_TAKE, execution); handlePassedAssignee(execution, dto); sendMessageQueue(dto, PROCESS_ACTIVITY_TAKE); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onTake...end, activityId: {}", + log.info("RocketMqBpmActivityEventListener#onTake...end, activityId: {}", execution.getCurrentActivityId()); - } } @Override public void onEnd(DelegateExecution execution) { - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onEnd...activityId: {}", + log.info("RocketMqMessagePushEventListener#onEnd...activityId: {}", execution.getCurrentActivityId()); - } ProcessActivityDTO dto = build(PROCESS_ACTIVITY_END, execution); handlePassedAssignee(execution, dto); sendMessageQueue(dto, PROCESS_ACTIVITY_END); - if (log.isDebugEnabled()) { - log.debug("RocketMqBpmActivityEventListener#onEnd...end, activityId: {}", + log.info("RocketMqBpmActivityEventListener#onEnd...end, activityId: {}", execution.getCurrentActivityId()); - } } private ProcessActivityDTO build(ProcessActivityEventEnum type, DelegateExecution execution) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index a9c8e6dbc..7728a7e68 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -114,19 +114,15 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || Objects.isNull(event.getAssigners())) { return; } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onNotice...msgTemplateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onNotice...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } if (Objects.nonNull(event.getNoticeConfig().getNotice())) { MessagePushDTO dto = build(event.getNoticeConfig().getNotice().getNoticeMessageId(), PROCESS_PUSH_NOTICE, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_NOTICE); } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onNotice...end, msgTemplateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onNotice...end, msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } } @@ -138,22 +134,18 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || Objects.isNull(event.getAssigners())) { return; } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onPendingPush...msgTemplateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onPendingPush...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getPending().getPendingMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } if (Objects.nonNull(event.getNoticeConfig().getPending())) { MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_PENDING); } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onPendingPush...end, msgTemplateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onPendingPush...end, msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getPending().getPendingMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } } @Override @@ -163,21 +155,17 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || !StringUtils.hasText(event.getNoticeConfig().getPending().getPendingMessageId())) { return; } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onPendingComplete...msgTemplateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onPendingComplete...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getPending().getPendingMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } if (Objects.nonNull(event.getNoticeConfig().getPending())) { MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING_COMPLETE, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_PENDING_COMPLETE); } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onPendingComplete...end, msgTemplateId: {}, receivePerson: " + + log.info("RocketMqMessagePushEventListener#onPendingComplete...end, msgTemplateId: {}, receivePerson: " + "{}", event.getNoticeConfig().getPending().getPendingMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } } @Override @@ -187,21 +175,17 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || !StringUtils.hasText(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId())) { return; } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onCarbonCopy... cc' templateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onCarbonCopy... cc' templateId: {}, receivePerson: {}", event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } if (Objects.nonNull(event.getNoticeConfig().getCarbonCopy())) { MessagePushDTO dto = build(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), PROCESS_CARBON_COPY, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_CARBON_COPY); } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onCarbonCopy...end, cc' templateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onCarbonCopy...end, cc' templateId: {}, receivePerson: {}", event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), JSONUtil.toJsonStr(event.getAssigners())); - } } /** @@ -216,19 +200,15 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || !StringUtils.hasText(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId())) { return; } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onCarbonCopyComplete... cc' templateId: {}", + log.info("RocketMqMessagePushEventListener#onCarbonCopyComplete... cc' templateId: {}", event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId()); - } if (Objects.nonNull(event.getNoticeConfig().getCarbonCopy())) { MessagePushDTO dto = build(event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId(), PROCESS_CARBON_COPY_COMPLETE, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_CARBON_COPY_COMPLETE); } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onCarbonCopyComplete...end, cc' templateId: {}", + log.info("RocketMqMessagePushEventListener#onCarbonCopyComplete...end, cc' templateId: {}", event.getNoticeConfig().getCarbonCopy().getCarbonCopyMessageId()); - } } @Override @@ -239,19 +219,15 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< || Objects.isNull(event.getAssigners())) { return; } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onSms...msgTemplateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onSms...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getSms().getSmsId(), JSONUtil.toJsonStr(event.getAssigners())); - } if (Objects.nonNull(event.getNoticeConfig().getCarbonCopy())) { MessagePushDTO dto = build(event.getNoticeConfig().getSms().getSmsId(), PROCESS_PUSH_SMS, event, collectionVariable(event)); sendMessageQueue(dto, PROCESS_PUSH_SMS); } - if (log.isDebugEnabled()) { - log.debug("RocketMqMessagePushEventListener#onSms...end, msgTemplateId: {}, receivePerson: {}", + log.info("RocketMqMessagePushEventListener#onSms...end, msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getSms().getSmsId(), JSONUtil.toJsonStr(event.getAssigners())); - } } private Map collectionVariable(MessagePushEvent event) { @@ -303,9 +279,7 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< // 传递业务的参数 REMOVE_KEYS.forEach(originVariables::remove); - if (log.isDebugEnabled()) { - log.debug("流程实例的参数: {}", JSONUtil.toJsonStr(originVariables)); - } + log.info("流程实例的参数: {}", JSONUtil.toJsonStr(originVariables)); if (CollectionUtils.isEmpty(originVariables)) { return variables; } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java index 715342812..4469be0b6 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java @@ -40,46 +40,30 @@ public class MessagePushProcessEventListener extends AbstractBpmnEventListener

repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()).singleResult()); Process mainProcess = getContext().getProcess(() -> repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess()); @@ -84,17 +81,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_CREATED); - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onCreated...end: {}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onCreated...end: {}", event.getProcessInstanceId()); } @Override public void onStarted(FlowableProcessStartedEvent event) { - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onStarted...{}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onStarted...{}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()) .singleResult()); @@ -122,16 +115,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessInstanceVersion(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_STARTED); - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onStarted...end: {}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onStarted...end: {}", ((ExecutionEntityImpl) event.getEntity()).getProcessInstanceId()); } @Override public void onCancelled(FlowableCancelledEvent event) { - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onCancelled...{}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onCancelled...{}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) .singleResult()); @@ -157,9 +146,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessDeleteReason(event, dto); setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_CANCELLED); - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onCancelled...end: {}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onCancelled...end: {}", event.getProcessInstanceId()); } /** @@ -169,9 +156,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< */ @Override public void onRejected(FlowableCancelledEvent event) { - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onRejected...{}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onRejected...{}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) .singleResult()); @@ -197,16 +182,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessDeleteReason(event, dto); setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_REJECTED); - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onRejected...end: {}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onRejected...end: {}", event.getProcessInstanceId()); } @Override public void onAborted(FlowableCancelledEvent event) { - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onAborted...{}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onAborted...{}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getDeploymentId()) .singleResult()); @@ -232,16 +213,12 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< setProcessDeleteReason(event, dto); setProcessInstanceVersion(event.getProcessInstanceId(), dto); sendMessageQueue(dto, PROCESS_INSTANCE_ABORTED); - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onAborted...end: {}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onAborted...end: {}", event.getProcessInstanceId()); } @Override public void onCompleted(FlowableEngineEntityEvent event) { - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onCompleted...{}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onCompleted...{}", event.getProcessInstanceId()); Deployment deployment = getContext().getDeployment(() -> repositoryService.createDeploymentQuery() .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()) .singleResult()); @@ -270,9 +247,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< } dto.setWorkflowEngineVersion(version); sendMessageQueue(dto, PROCESS_INSTANCE_COMPLETED); - if (log.isDebugEnabled()) { - log.debug("MessagePushProcessEventListener#onCompleted...end: {}", event.getProcessInstanceId()); - } + log.info("MessagePushProcessEventListener#onCompleted...end: {}", event.getProcessInstanceId()); } private void setProcessDeleteReason(FlowableCancelledEvent event, ProcessInstanceDTO dto) { 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 e2e78e808..0c0891fdc 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 @@ -78,9 +78,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener BpmnTaskDelegateAssigner.toObjectCompatible(delegateTask.getVariable(INTERNAL_INITIATOR))); @@ -109,9 +107,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener assignerList = runtimeService.getVariable(delegateTask.getProcessInstanceId(), INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + delegateTask.getTaskDefinitionKey(), List.class); @@ -63,8 +61,6 @@ public class SnapshotBpmnTaskTaskEvent_100_Listener extends AbstractBpmnEventLis } }); - if (log.isDebugEnabled()) { - log.debug("SnapshotBpmnTaskTaskEventListener#onAssigned...end: {}", delegateTask.getTaskDefinitionKey()); - } + log.info("SnapshotBpmnTaskTaskEventListener#onAssigned...end: {}", delegateTask.getTaskDefinitionKey()); } } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/ExtDatabaseInitializer.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/ExtDatabaseInitializer.java index b93a1d256..41e78ec37 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/ExtDatabaseInitializer.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/ExtDatabaseInitializer.java @@ -53,10 +53,10 @@ public class ExtDatabaseInitializer implements ApplicationRunner { if (Objects.equals(DB_SCHEMA_UPDATE_DROP_CREATE, springProcessEngineConfiguration.getDatabaseSchemaUpdate())) { tables.forEach(this::executeSqlScript); } - log.debug("tables: {}", JSONUtil.toJsonStr(tables)); + log.info("tables: {}", JSONUtil.toJsonStr(tables)); localSqlFiles().forEach(i -> { if (!tables.contains(i.replace(".sql", "").toUpperCase())) { - log.debug("execute sql script: {}", i); + log.info("execute sql script: {}", i); executeSqlScript(i); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java index f126c4263..aba4addb3 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java @@ -65,7 +65,7 @@ public class VersionUpgradeInitializer implements ApplicationRunner { String fileName = FILE_PREFIX + upgradeVersion + ".sql"; try { executeSqlScript(fileName); - log.debug("execute sql script: {}", fileName); + log.info("execute sql script: {}", fileName); } catch (Exception e) { LogUtil.error(LogUtil.ErrorType.ERROR_SQL, "升级服务数据库版本发生异常,文件: {}, 异常信息: {}", fileName, e.getMessage()); result.compareAndSet(true, false);