diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java index f86745f..4fa448d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java @@ -1,6 +1,7 @@ package com.electromagnetic.industry.software.manage.aop; import cn.hutool.json.JSONUtil; +import com.electromagnetic.industry.software.common.pojo.UserLoginInfo; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil; import com.electromagnetic.industry.software.common.util.UserThreadLocal; @@ -18,6 +19,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import java.util.HashMap; import java.util.Map; +import java.util.Objects; @Aspect @Component @@ -67,6 +69,12 @@ public class ServiceAspect { StopWatch stopwatch = new StopWatch(); stopwatch.start("接口:" + methodInfo); Object rvt = jp.proceed(); + + if (Objects.isNull(UserThreadLocal.getUser())) { + UserLoginInfo userLoginInfo = new UserLoginInfo(); + UserThreadLocal.set(userLoginInfo); + } + UserThreadLocal.setReqArgs(paramInfo); if (rvt instanceof ResponseEntity) { UserThreadLocal.setRes(ElectromagneticResultUtil.success("")); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java index aecd39d..a34ae5e 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java @@ -124,11 +124,9 @@ public class LoginInterceptor implements HandlerInterceptor { userAccessLog.setAccessSuccess(false); userAccessLog.setFailureReason(result.getErrorMessage()); } - } else { + } else { // 返回为ResponseEntity,且状态为失败。 userAccessLog.setAccessSuccess(false); } - - // TODO 如果是下载的文件,那么返回的是ResponseEntity而不是ElectromagneticResult userAccessLogMapper.insert(userAccessLog); UserThreadLocal.remove(); }