From 5dc79ad08836c944078234a3c4d97edb416e76f6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 七月 2020 11:14:52 +0800
Subject: [PATCH] #任务中心————库位移转

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 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..07b18d7 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -96,8 +96,8 @@
             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){
+            // 15鍒嗛挓鍚庤繃鏈�
+            if (System.currentTimeMillis() - timestamp > 900000){
                 Http.response(response, BaseRes.DENIED);
                 return false;
             }
@@ -106,15 +106,17 @@
                 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);
+            // 鎿嶄綔鏃ュ織
+            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);
@@ -142,7 +144,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