diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
index 9a57e0173..7abe78c07 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
@@ -105,9 +105,9 @@ public class LogAspect {
log.info("[--request--][请求接口:{}][请求参数:{}]", url, params);
currentTime.set(System.currentTimeMillis());
result = joinPoint.proceed();
- SysLog log = new SysLog("INFO", System.currentTimeMillis() - currentTime.get());
+// SysLog log = new SysLog("INFO", System.currentTimeMillis() - currentTime.get());
currentTime.remove();
- logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log);
+// logServsice.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log);
}catch (Throwable ex) {
StringBuffer errorStack = new StringBuffer();
errorStack.append("
【异常堆栈:");
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/WhiteListLogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/WhiteListLogAspect.java
index a067bdb93..bf6e0dae7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/WhiteListLogAspect.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/WhiteListLogAspect.java
@@ -1,133 +1,133 @@
-package org.nl.modules.logging.aspect;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.modules.common.utils.RequestHolder;
-import org.nl.modules.common.utils.StringUtils;
-import org.nl.modules.common.utils.ThrowableUtil;
-import org.nl.modules.logging.properties.LoggingProperties;
-import org.nl.system.service.logging.ISysInterfaceLogService;
-import org.nl.system.service.logging.dao.SysInterfaceLog;
-import org.nl.system.service.logging.dao.SysLog;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.multipart.support.MultipartFilter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * @author by: zz
- * @ClassName: WhiteListLogAspect
- * @Description: 外部接口日志切面插入日志表
- * @Date: 2024/7/25 15:06
- */
-@Slf4j
-@Aspect
-@Component
-public class WhiteListLogAspect {
-
- @Autowired
- private LoggingProperties loggingProperties;
-
- @Autowired
- private ISysInterfaceLogService interfaceLogService;
-
- private AntPathMatcher pathMatcher = new AntPathMatcher();
-
- @Pointcut("execution(* org.nl.wms.ext..*Service.*(..)) || @annotation(org.nl.modules.logging.annotation.InterfaceLog)")
- public void logPointcut() {
- // 该方法无方法体,主要为了让同类中其他方法使用此切入点
- }
-
- @Around("logPointcut()")
- public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
- Object[] args = joinPoint.getArgs();
- long startTime = System.currentTimeMillis();
- try {
- Object result = joinPoint.proceed(args);
- long endTime = System.currentTimeMillis();
- long time = endTime - startTime;
- MethodSignature signature = (MethodSignature) joinPoint.getSignature();
- //黑名单接口不打印日志
- if (!shouldLog(signature.getName())){
- addLog(joinPoint, JSONUtil.toJsonStr(result), time);
- }
- return result;
- } catch (Exception e) {
- log.error("doAround日志记录异常，异常信息为:", e);
- throw e;
- }
-
- }
-
- /**
- * 日志记录操作
- */
- public void addLog(ProceedingJoinPoint joinPoint, String outParams, long time) {
- ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
- HttpServletRequest request = null;
- if (ObjectUtil.isNotEmpty(attributes)) {
- request = attributes.getRequest();
- }
- // 方法路径
- SysInterfaceLog log = new SysInterfaceLog("INFO", time);
- String borwser = ObjectUtil.isNotEmpty(attributes) ? StringUtils.getBrowser(request) : "定时器";
- String ip = ObjectUtil.isNotEmpty(attributes) ? StringUtils.getIp(request) : "定时器";
- interfaceLogService.save(getUsername(), outParams, borwser, ip, joinPoint, log);
- }
-
- public String getUsername() {
- try {
- return SecurityUtils.getCurrentUsername();
- } catch (Exception e) {
- return "";
- }
- }
-
- @AfterThrowing(pointcut = "logPointcut()", throwing = "e")
- public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
- try {
- SysInterfaceLog log = new SysInterfaceLog("ERROR", 0L);
- log.setException_detail(ThrowableUtil.getStackTrace(e).getBytes());
- HttpServletRequest request = RequestHolder.getHttpServletRequest();
- interfaceLogService.save(getUsername(), e.toString(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
- }catch (Exception ex){
- log.error("doAround日志记录异常，异常信息为:", ex);
- }
-
- }
-
- /**
- * 过滤参数
- *
- * @param args
- * @return
- */
- private List