From 973eed10d720c7dbd0020407c3b89fe1d385944f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:42:20 +0800
Subject: [PATCH] wms功能完善

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   27 ++++++++++++++++++---------
 1 files changed, 18 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 1bc1838..775932f 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -10,6 +10,8 @@
 import com.zy.common.utils.Http;
 import com.zy.system.entity.*;
 import com.zy.system.service.*;
+import com.zy.system.timer.LicenseTimer;
+import com.zy.system.timer.LoadingConfigTimer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.lang.Nullable;
@@ -41,12 +43,19 @@
     private PermissionService permissionService;
     @Autowired
     private RolePermissionService rolePermissionService;
-
+    @Autowired
+    private LoadingConfigTimer loadingConfigTimer;
+    @Autowired
+    private LicenseTimer licenseTimer;
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         cors(response);
         if (handler instanceof org.springframework.web.servlet.resource.ResourceHttpRequestHandler) {
             return true;
+        }
+        if (!licenseTimer.getSystemSupport()) {
+            Http.response(response, BaseRes.NO_ACTIVATION);
+            return false;
         }
         // super璐﹀彿
         String token = request.getHeader("token");
@@ -55,7 +64,7 @@
             if (deToken!=null){
                 long timestamp = Long.parseLong(deToken.substring(0, 13));
                 // 1澶╁悗杩囨湡
-                if (System.currentTimeMillis() - timestamp > 86400000){
+                if (System.currentTimeMillis() - timestamp > loadingConfigTimer.getTokenExpire()){
                     Http.response(response, BaseRes.DENIED);
                     return false;
                 }
@@ -141,13 +150,13 @@
                     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){

--
Gitblit v1.9.1