From db68c17a0780f30daeef1d1c4ee715bb8dac398c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 七月 2022 12:41:48 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   60 +++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 70f4ae5..3932e07 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -2,12 +2,14 @@
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.common.utils.Http;
-import com.zy.system.entity.*;
-import com.zy.system.service.*;
+import com.core.annotations.AppAuth;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
+import com.zy.common.properties.SystemProperties;
+import com.zy.common.utils.Http;
+import com.zy.system.entity.*;
+import com.zy.system.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.lang.Nullable;
@@ -19,6 +21,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
+import java.util.Date;
 
 /**
  * Created by vincent on 2019-06-13
@@ -62,10 +65,21 @@
                 }
             }
         }
+        // 鐧藉悕鍗�
+//        if (IpTools.gainRealIp(request).equals("127.0.0.1")) {
+//            request.setAttribute("userId", 9527);
+//            return true;
+//        }
         // 璺ㄥ煙璁剧疆
         // response.setHeader("Access-Control-Allow-Origin", "*");
         HandlerMethod handlerMethod = (HandlerMethod) handler;
         Method method = handlerMethod.getMethod();
+        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)){
@@ -85,6 +99,11 @@
         }
     }
 
+    @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");
@@ -94,10 +113,10 @@
                 return false;
             }
             User user = userService.selectById(userLogin.getUserId());
-            String deToken = Cools.deTokn(token, user.getPassword());
-            long timestamp = Long.parseLong(deToken.substring(0, 13));
-            // 1澶╁悗杩囨湡
-            if (System.currentTimeMillis() - timestamp > 86400000){
+//            String deToken = Cools.deTokn(token, user.getPassword());
+//            long timestamp = Long.parseLong(deToken.substring(0, 13));
+            // 15鍒嗛挓鍚庤繃鏈�
+            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
                 Http.response(response, BaseRes.DENIED);
                 return false;
             }
@@ -106,15 +125,26 @@
                 Http.response(response, BaseRes.LIMIT);
                 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("userId", user.getId());
-            request.setAttribute("operateLog", operateLog);
+            // 鏇存柊 token 鏈夋晥鏈�
+            userLogin.setCreateTime(new Date());
+            userLoginService.updateById(userLogin);
+            // 鎿嶄綔鏃ュ織
+            if (!Cools.isEmpty(memo)) {
+                // 杩涜婵�娲诲垽鏂�
+                if (!SystemProperties.SYSTEM_ACTIVATION) {
+                    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);
+            }
             return true;
         } catch (Exception e){
             Http.response(response, BaseRes.DENIED);
@@ -142,7 +172,7 @@
     /**
      * 璺ㄥ煙
      */
-    private 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