From ed0a79ffec5d25dae6b0b24393c331ab36d7d50b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 六月 2024 15:35:12 +0800
Subject: [PATCH] # 自动回流数量限制

---
 src/main/java/com/zy/common/config/AspectConfig.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/common/config/AspectConfig.java b/src/main/java/com/zy/common/config/AspectConfig.java
index ebd180a..780eb46 100644
--- a/src/main/java/com/zy/common/config/AspectConfig.java
+++ b/src/main/java/com/zy/common/config/AspectConfig.java
@@ -49,9 +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();
-        }
+        //if(requestAttributes != null){
+        //    return joinPoint.proceed();
+        //}
         HttpServletRequest request = requestAttributes.getRequest();
         long start = System.currentTimeMillis();
         Object result = joinPoint.proceed(joinPoint.getArgs());
@@ -62,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());
                 }
             }
         }
@@ -86,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"));
@@ -99,7 +99,7 @@
 
         // 璁板綍鎿嶄綔鏃ュ織
         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())));

--
Gitblit v1.9.1