From 43e5e1219ff2c3f36ac34e06f78bde5397908bbd Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 27 May 2024 19:45:41 +0800 Subject: [PATCH] =?UTF-8?q?update(REQ-2324)=20-=20=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=BC=82=E5=B8=B83=E6=AC=A1=E9=87=8D=E8=AF=95=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BB=85=E5=9C=A8=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E6=AC=A1=E9=87=8D=E8=AF=95=E4=BB=8D=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E6=97=B6=E5=80=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/listener/EngineNoticeEventListener.java | 14 +++++++------- .../server/common/aspectj/ErrorReportAspect.java | 2 +- .../delegate/AbstractBpmnTaskAssigneeSelector.java | 2 +- .../listener/error/ErrorReporterEventListener.java | 4 +++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java index 5d52849e0..e455f319e 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java @@ -63,43 +63,43 @@ public class EngineNoticeEventListener extends AbstractFlowableEventListener { stopWatch.start("PUSH-NOTICE Event Execution Time"); getOrderedListeners().forEach(i -> i.onNotice(event)); stopWatch.stop(); - log.info("PUSH-NOTICE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", event.getProcessInstanceId()); + log.info("PUSH-NOTICE StopWatch : running time = {} 's,processInstanceId: {}", stopWatch.getTotalTimeSeconds(), event.getProcessInstanceId()); break; case PENDING_PUSH: stopWatch.start("PUSH-PENDING Event Execution Time"); getOrderedListeners().forEach(i -> i.onPendingPush(event)); stopWatch.stop(); - log.info("PUSH-PENDING StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", event.getProcessInstanceId()); + log.info("PUSH-PENDING StopWatch : running time = {} 's,processInstanceId: {}", stopWatch.getTotalTimeSeconds(), event.getProcessInstanceId()); break; case PENDING_COMPLETE: stopWatch.start("PUSH-PENDING-COMPLETE Event Execution Time"); getOrderedListeners().forEach(i -> i.onPendingComplete(event)); stopWatch.stop(); - log.info("PUSH-PENDING-COMPLETE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", event.getProcessInstanceId()); + log.info("PUSH-PENDING-COMPLETE StopWatch : running time = {} 's,processInstanceId: {}", stopWatch.getTotalTimeSeconds(), event.getProcessInstanceId()); break; case PENDING_ROLLBACK: stopWatch.start("PUSH-PENDING-ROLLBACK Event Execution Time"); getOrderedListeners().forEach(i -> i.onPendingRollback(event)); stopWatch.stop(); - log.info("PUSH-PENDING-ROLLBACK StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's"); + log.info("PUSH-PENDING-ROLLBACK StopWatch : running time = {} 's", stopWatch.getTotalTimeSeconds()); break; case CARBON_COPY: stopWatch.start("CARBON-COPY Event Execution Time"); getOrderedListeners().forEach(i -> i.onCarbonCopy(event)); stopWatch.stop(); - log.info("CARBON-COPY StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", event.getProcessInstanceId()); + log.info("CARBON-COPY StopWatch : running time = {} 's,processInstanceId: {}", stopWatch.getTotalTimeSeconds(), event.getProcessInstanceId()); break; case CARBON_COPY_COMPLETE: stopWatch.start("CARBON-COPY-COMPLETE Event Execution Time"); getOrderedListeners().forEach(i -> i.onCarbonCopyComplete(event)); stopWatch.stop(); - log.info("CARBON-COPY-COMPLETE StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", event.getProcessInstanceId()); + log.info("CARBON-COPY-COMPLETE StopWatch : running time = {} 's,processInstanceId: {}", stopWatch.getTotalTimeSeconds(), event.getProcessInstanceId()); break; case SMS: stopWatch.start("SMS Event Execution Time"); getOrderedListeners().forEach(i -> i.onSms(event)); stopWatch.stop(); - log.info("SMS StopWatch : running time = " + stopWatch.getTotalTimeSeconds() + " 's,processInstanceId: {}", event.getProcessInstanceId()); + log.info("SMS StopWatch : running time = {} 's,processInstanceId: {}", stopWatch.getTotalTimeSeconds(), event.getProcessInstanceId()); break; default: } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java index ca9d92d8f..4636021f5 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java @@ -65,7 +65,7 @@ public class ErrorReportAspect implements Ordered { watch.start(signature.toShortString()); Object result = joinPoint.proceed(); watch.stop(); - log.info("StopWatch '" + watch.getLastTaskName() + "': running time = " + watch.getTotalTimeSeconds() + " s"); + log.info("StopWatch '{}': running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds()); if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) { String type = getType(joinPoint); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java index 32ce65e6b..0d32c68cf 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java @@ -115,7 +115,7 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign ApiResult result = supplier.get(); stopWatch.stop(); log.info("{}-Cost:{}, Result: {}", operatorDesc, - "API StopWatch '" + stopWatch.getId() + "': running time = " + stopWatch.getTotalTimeSeconds() + " s", + "API StopWatch '" + stopWatch.getId() + "': running time = " + stopWatch.getTotalTimeSeconds() + " 's", JSONUtil.toJsonStr(result)); try { if (stopWatch.getTotalTimeSeconds() > executionStartListener.getApiTimeout()) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java index 2fa624d0a..aff371d14 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java @@ -50,7 +50,9 @@ public class ErrorReporterEventListener implements BpmnAsyncJobEventListener { } else if (Lists.newArrayList("live", "master").contains(profile)) { reporterType = ReporterType.ONLY_LOG; } - reporterType.executeAction(profile, "异步任务执行异常, 剩余重试次数:" + job.getRetries(), sendDingTalk, new Object[]{job}, "act_ru_job", throwable, false); + if (job.getRetries() <= 1) { + reporterType.executeAction(profile, "异步任务执行异常, 重试 3 次后仍未成功", sendDingTalk, new Object[]{job}, "act_ru_job", throwable, false); + } } @Override