From 1c55a832ef8c153ea2a5d3a61c762259a745d367 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 13:18:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index a727bce..b42a596 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -2,12 +2,13 @@
 
 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.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 +20,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,6 +64,11 @@
                 }
             }
         }
+        // 鐧藉悕鍗�
+//        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;
@@ -94,10 +101,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;
             }
@@ -108,8 +115,17 @@
             }
             // 璇锋眰缂撳瓨
             request.setAttribute("userId", user.getId());
+            // 鏇存柊 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());
@@ -144,7 +160,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