From 829f315f17de8cd04756a6c53b325c368469d246 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 11:01:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 991e816..a727bce 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -69,7 +69,7 @@
         if (method.isAnnotationPresent(ManagerAuth.class)){
             ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
             if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
-                return check(request, response);
+                return check(request, response, annotation.memo());
             }
         }
         return true;
@@ -85,7 +85,7 @@
         }
     }
 
-    private boolean check(HttpServletRequest request, HttpServletResponse response) {
+    private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
         try {
             String token = request.getHeader("token");
             UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
@@ -106,15 +106,17 @@
                 Http.response(response, BaseRes.LIMIT);
                 return false;
             }
-            // 鎿嶄綔鏃ュ織
-            OperateLog operateLog = new OperateLog();
-            operateLog.setAction(request.getRequestURI());
-            operateLog.setIp(request.getRemoteAddr());
-            operateLog.setUserId(user.getId());
-            operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
             // 璇锋眰缂撳瓨
             request.setAttribute("userId", user.getId());
-            request.setAttribute("operateLog", operateLog);
+            // 鎿嶄綔鏃ュ織
+            if (!Cools.isEmpty(memo)) {
+                OperateLog operateLog = new OperateLog();
+                operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
+                operateLog.setIp(request.getRemoteAddr());
+                operateLog.setUserId(user.getId());
+                operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
+                request.setAttribute("operateLog", operateLog);
+            }
             return true;
         } catch (Exception e){
             Http.response(response, BaseRes.DENIED);

--
Gitblit v1.9.1