From 2914a93d0e6d0bb14355a2756f783cb94c102547 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Tue, 11 Oct 2022 14:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/modules/logging/aspect/LogAspect.java | 4 ++-- .../modules/logging/service/impl/LogServiceImpl.java | 11 ++--------- nladmin-ui/src/views/monitor/log/errorLog.vue | 8 ++++---- nladmin-ui/src/views/monitor/log/index.vue | 4 ++-- nladmin-ui/src/views/monitor/online/index.vue | 2 +- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index e4730e1d8..24e8e05f4 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java @@ -28,6 +28,7 @@ import org.aspectj.lang.reflect.MethodSignature; import org.nl.modules.common.utils.RequestHolder; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.common.utils.StringUtils; +import org.nl.modules.common.utils.ThrowableUtil; import org.nl.modules.logging.domain.Log; import org.nl.modules.logging.service.LogService; import org.springframework.stereotype.Component; @@ -132,8 +133,7 @@ public class LogAspect { public void logAfterThrowing(JoinPoint joinPoint, Throwable e) { Log log = new Log("ERROR",System.currentTimeMillis() - currentTime.get()); currentTime.remove(); - // log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes()); - // log.setExceptionDetail(null); + log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes()); HttpServletRequest request = RequestHolder.getHttpServletRequest(); logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint)joinPoint, log); } diff --git a/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java index 197e98740..caaffddfe 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java @@ -19,8 +19,8 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; import org.nl.modules.common.utils.PageUtil; @@ -33,10 +33,6 @@ import org.nl.modules.logging.service.LogService; import org.nl.modules.logging.service.dto.LogQueryCriteria; import org.nl.modules.logging.service.mapstruct.LogErrorMapper; import org.nl.modules.logging.service.mapstruct.LogSmallMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -57,9 +53,8 @@ import java.util.Map; */ @Service @RequiredArgsConstructor +@Slf4j public class LogServiceImpl implements LogService { - private static final Marker MARKER = MarkerFactory.getMarker("request"); - private static final Logger log = LoggerFactory.getLogger(LogServiceImpl.class); private final LogRepository logRepository; private final LogErrorMapper logErrorMapper; private final LogSmallMapper logSmallMapper; @@ -107,9 +102,7 @@ public class LogServiceImpl implements LogService { logDto.setMethod(methodName); logDto.setUsername(username); logDto.setParams(getParameter(method, joinPoint.getArgs())); - // logDto.setParams(""); logDto.setBrowser(browser); - log.info(MARKER,JSONObject.toJSONString(logDto)); logRepository.save(logDto); } diff --git a/nladmin-ui/src/views/monitor/log/errorLog.vue b/nladmin-ui/src/views/monitor/log/errorLog.vue index 33c392a89..ae322c625 100644 --- a/nladmin-ui/src/views/monitor/log/errorLog.vue +++ b/nladmin-ui/src/views/monitor/log/errorLog.vue @@ -33,9 +33,9 @@ - - - + + + @@ -78,7 +78,7 @@ export default { add: false, edit: false, del: false, - download: true + download: false } }, methods: { diff --git a/nladmin-ui/src/views/monitor/log/index.vue b/nladmin-ui/src/views/monitor/log/index.vue index 36da85d65..ca3206ec2 100644 --- a/nladmin-ui/src/views/monitor/log/index.vue +++ b/nladmin-ui/src/views/monitor/log/index.vue @@ -34,7 +34,7 @@ - +