From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index b42a596..90f1f5b 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -1,7 +1,7 @@
 package com.zy.common.config;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
@@ -49,12 +49,12 @@
         }
         // super璐﹀彿
         String token = request.getHeader("token");
-        if (token!=null) {
+        if (token != null) {
             String deToken = Cools.deTokn(token, superPwd);
-            if (deToken!=null){
+            if (deToken != null) {
                 long timestamp = Long.parseLong(deToken.substring(0, 13));
-                // 1澶╁悗杩囨湡
-                if (System.currentTimeMillis() - timestamp > 86400000){
+                // 鍗婂皬鏃跺悗杩囨湡
+                if (System.currentTimeMillis() - timestamp > 1000 * 60 * 30) {
                     Http.response(response, BaseRes.DENIED);
                     return false;
                 }
@@ -73,9 +73,15 @@
         // response.setHeader("Access-Control-Allow-Origin", "*");
         HandlerMethod handlerMethod = (HandlerMethod) handler;
         Method method = handlerMethod.getMethod();
-        if (method.isAnnotationPresent(ManagerAuth.class)){
+        if (method.isAnnotationPresent(AppAuth.class)) {
+            AppAuth annotation = method.getAnnotation(AppAuth.class);
+            if (annotation.value().equals(AppAuth.Auth.CHECK)) {
+                request.setAttribute("appAuth", annotation.memo());
+            }
+        }
+        if (method.isAnnotationPresent(ManagerAuth.class)) {
             ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
-            if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
+            if (annotation.value().equals(ManagerAuth.Auth.CHECK)) {
                 return check(request, response, annotation.memo());
             }
         }
@@ -92,11 +98,20 @@
         }
     }
 
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception {
+//        Object r = request.getAttribute("cool-response");
+    }
+
     private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
         try {
-            String token = request.getHeader("token");
+            String token = new String();
+            token = request.getHeader("token");
+            if (Cools.isEmpty(token)) {
+                return true;
+            }
             UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
-            if (null == userLogin){
+            if (null == userLogin) {
                 Http.response(response, BaseRes.DENIED);
                 return false;
             }
@@ -104,7 +119,7 @@
 //            String deToken = Cools.deTokn(token, user.getPassword());
 //            long timestamp = Long.parseLong(deToken.substring(0, 13));
             // 15鍒嗛挓鍚庤繃鏈�
-            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 1800000) {
                 Http.response(response, BaseRes.DENIED);
                 return false;
             }
@@ -125,16 +140,16 @@
                     Http.response(response, BaseRes.NO_ACTIVATION);
                     return false;
                 }
-                // 璁板綍鎿嶄綔鏃ュ織
-                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);
+//                // 璁板綍鎿嶄綔鏃ュ織
+//                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){
+        } catch (Exception e) {
             Http.response(response, BaseRes.DENIED);
             return false;
         }
@@ -143,6 +158,7 @@
 
     /**
      * 鏉冮檺鎷︽埅
+     *
      * @return false:鏃犳潈闄�;   true:璁よ瘉閫氳繃
      */
     private boolean limit(String action, User user) {
@@ -160,7 +176,7 @@
     /**
      * 璺ㄥ煙
      */
-    public static void cors(HttpServletResponse response){
+    public static void cors(HttpServletResponse response) {
         // 璺ㄥ煙璁剧疆
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Access-Control-Allow-Credentials", "true");

--
Gitblit v1.9.1