Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req

This commit is contained in:
yangqicheng 2024-05-30 17:05:12 +08:00
commit 5c7b74be42

View File

@ -4,6 +4,7 @@ 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;
@ -24,6 +25,7 @@ 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;
@ -65,7 +67,12 @@ public class ErrorReportAspect implements Ordered {
watch.start(signature.toShortString());
Object result = joinPoint.proceed();
watch.stop();
log.info("StopWatch '{}': running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds());
String params = "";
Object[] args = joinPoint.getArgs();
if (args != null && args.length > 0) {
params = Arrays.stream(args).map(JSONUtil::toJsonStr).collect(Collectors.joining(","));
}
log.info("StopWatch '{}',params:{},result:{}: running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds(), params, JSONUtil.toJsonStr(result));
if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) {
String type = getType(joinPoint);