From d417e332b39e7da99f637e94ebacf199fb158a72 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 18:16:50 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/config/AspectConfig.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AspectConfig.java b/src/main/java/com/zy/common/config/AspectConfig.java
index 64d95ff..780eb46 100644
--- a/src/main/java/com/zy/common/config/AspectConfig.java
+++ b/src/main/java/com/zy/common/config/AspectConfig.java
@@ -41,7 +41,7 @@
@Autowired
private OperateLogService operateLogService;
- @Pointcut("execution(* com.zy.asrs.controller..*.*(..))")
+ @Pointcut("execution(* com.zy.asrs.controller.*(..))")
private void webLog() {
}
@@ -49,6 +49,9 @@
"||@within(org.springframework.stereotype.Controller)")
public Object after(ProceedingJoinPoint joinPoint) throws Throwable{
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ //if(requestAttributes != null){
+ // return joinPoint.proceed();
+ //}
HttpServletRequest request = requestAttributes.getRequest();
long start = System.currentTimeMillis();
Object result = joinPoint.proceed(joinPoint.getArgs());
@@ -59,7 +62,7 @@
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
if (!Cools.isEmpty(annotation.memo())) {
- saveLog(joinPoint, request, result);
+ saveLog(joinPoint, request, result,annotation.memo());
}
}
}
@@ -83,7 +86,7 @@
&& !(obj instanceof HttpServletRequest)).collect(Collectors.toList());
}
- private void saveLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object result) {
+ private void saveLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object result,String memo) {
Long userId = 9527L;
String token = request.getHeader("token");
UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token).eq("system", "WMS"));
@@ -96,13 +99,12 @@
// 璁板綍鎿嶄綔鏃ュ織
OperateLog operateLog = new OperateLog();
- operateLog.setAction(request.getRequestURI());
+ operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
operateLog.setIp(request.getRemoteAddr());
operateLog.setUserId(userId);
operateLog.setRequest(JSONObject.toJSONString(filterArgs(joinPoint.getArgs())));
operateLog.setResponse(JSONObject.toJSONString(result));
operateLogService.insert(operateLog);
- request.setAttribute("operateLog", operateLog);
}
}
\ No newline at end of file
--
Gitblit v1.9.1