From f7779c0ab5e756b36b9db007c645dfbfe4385cf9 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 28 Jun 2024 09:43:12 +0800
Subject: [PATCH] =?UTF-8?q?hotfix=20-=20=E8=B0=83=E6=95=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20API=20Log=20=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/aspectj/ErrorReportAspect.java     | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 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 c327caad7..1756449a0 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
@@ -1,7 +1,6 @@
 package cn.axzo.workflow.server.common.aspectj;
 
 import cn.axzo.workflow.core.common.event.ApiLogEvent;
-import cn.axzo.workflow.core.conf.SupportRefreshProperties;
 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;
@@ -62,20 +61,24 @@ public class ErrorReportAspect implements Ordered {
         Signature signature = joinPoint.getSignature();
         StopWatch watch = new StopWatch("running controller time");
         watch.start(signature.toShortString());
-        Object result = joinPoint.proceed();
-        watch.stop();
-        log.info("StopWatch '{}': running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds());
+        Object result = null;
+        try {
+            result = joinPoint.proceed();
+        } finally {
+            watch.stop();
+            log.info("StopWatch '{}': running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds());
 
-        if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) {
-            String type = getType(joinPoint);
-            ApiLogEvent event = new ApiLogEvent(MDC.get(CTX_LOG_ID_MDC),
-                    signature.toShortString(),
-                    Objects.equals(type, "Controller") ? joinPoint.getArgs() : null,
-                    Objects.equals(type, "Controller") ? result : null,
-                    watch.getTotalTimeSeconds(),
-                    type);
+            if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) {
+                String type = getType(joinPoint);
+                ApiLogEvent event = new ApiLogEvent(MDC.get(CTX_LOG_ID_MDC),
+                        signature.toShortString(),
+                        Objects.equals(type, "Controller") ? joinPoint.getArgs() : null,
+                        Objects.equals(type, "Controller") ? result : null,
+                        watch.getTotalTimeSeconds(),
+                        type);
 
-            applicationEventPublisher.publishEvent(event);
+                applicationEventPublisher.publishEvent(event);
+            }
         }
         return result;
     }