From fb323e3c9cc1878d808e6d215429a66293773b58 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 4 Jun 2024 10:53:20 +0800 Subject: [PATCH] =?UTF-8?q?update(REQ-2324)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8F=91=E9=80=81=20Dingtalk=20=E7=9A=84=E7=AD=96=E7=95=A5?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E5=8A=A8=E6=80=81=E6=8E=A7=E5=88=B6=E5=93=AA?= =?UTF-8?q?=E4=BA=9B=E5=8F=AF=E4=BB=A5=E5=8F=91=E9=80=81=E9=92=89=E9=92=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/server/common/aspectj/ErrorReportAspect.java | 8 +++++--- .../server/common/config/property/WorkflowProperties.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) 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 fa9e87040..d5b59e9e4 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 @@ -4,7 +4,6 @@ import cn.axzo.workflow.core.common.event.ApiLogEvent; import cn.axzo.workflow.server.common.annotation.EnvConfig; import cn.axzo.workflow.server.common.annotation.ErrorReporter; import cn.axzo.workflow.server.common.config.property.WorkflowProperties; -import cn.hutool.json.JSONUtil; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Arrays; import java.util.Objects; -import java.util.stream.Collectors; import static cn.azxo.framework.common.constatns.Constants.CTX_LOG_ID_MDC; @@ -117,7 +115,11 @@ public class ErrorReportAspect implements Ordered { EnvConfig[] envConfigs = errorReporter.envConfig(); for (EnvConfig envConfig : envConfigs) { if (Arrays.asList(envConfig.profiles()).contains(profile)) { - envConfig.type().executeAction(profile, operation.summary(), sendDingTalk, joinPoint.getArgs(), joinPoint.getSignature().toShortString(), e, + boolean filterSendDingTalk = sendDingTalk; + if (workflowProperties.getFilterSendDingTalk().contains(operation.summary())) { + filterSendDingTalk = false; + } + envConfig.type().executeAction(profile, operation.summary(), filterSendDingTalk, joinPoint.getArgs(), joinPoint.getSignature().toShortString(), e, workflowProperties.getFilterOperations().contains(operation.summary())); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/config/property/WorkflowProperties.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/config/property/WorkflowProperties.java index 6d5feaa92..7dfb575a3 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/config/property/WorkflowProperties.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/config/property/WorkflowProperties.java @@ -31,6 +31,6 @@ public class WorkflowProperties { /** * 将指定的 998 开头的响应码统一转成 200, 目前暂时没用了 */ - private List filterExceptionCode = new ArrayList<>(); + private List filterSendDingTalk = new ArrayList<>(); }