From 1d9c00b1fb1a8e6473fc8625470c7616866bb803 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 10:52:45 +0800
Subject: [PATCH] 13

---
 src/main/java/com/zy/common/config/AdminInterceptor.java |   35 ++++++++++++++++++++---------------
 1 files changed, 20 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 95122b7..3d0f696 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -1,15 +1,15 @@
 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;
-import com.zy.common.properties.SystemProperties;
 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,6 +41,10 @@
     private PermissionService permissionService;
     @Autowired
     private RolePermissionService rolePermissionService;
+    @Autowired
+    private LicenseTimer licenseTimer;
+    @Autowired
+    private LoadingConfigTimer loadingConfigTimer;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -50,12 +54,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));
                 // 鍗婂皬鏃跺悗杩囨湡
-                if (System.currentTimeMillis() - timestamp > 1000 * 60 * 30){
+                if (System.currentTimeMillis() - timestamp > loadingConfigTimer.getTokenExpire()) {
                     Http.response(response, BaseRes.DENIED);
                     return false;
                 }
@@ -74,15 +78,15 @@
         // response.setHeader("Access-Control-Allow-Origin", "*");
         HandlerMethod handlerMethod = (HandlerMethod) handler;
         Method method = handlerMethod.getMethod();
-        if (method.isAnnotationPresent(AppAuth.class)){
+        if (method.isAnnotationPresent(AppAuth.class)) {
             AppAuth annotation = method.getAnnotation(AppAuth.class);
-            if (annotation.value().equals(AppAuth.Auth.CHECK)){
+            if (annotation.value().equals(AppAuth.Auth.CHECK)) {
                 request.setAttribute("appAuth", annotation.memo());
             }
         }
-        if (method.isAnnotationPresent(ManagerAuth.class)){
+        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());
             }
         }
@@ -108,11 +112,11 @@
         try {
             String token = new String();
             token = request.getHeader("token");
-            if (Cools.isEmpty(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;
             }
@@ -120,7 +124,7 @@
 //            String deToken = Cools.deTokn(token, user.getPassword());
 //            long timestamp = Long.parseLong(deToken.substring(0, 13));
             // 15鍒嗛挓鍚庤繃鏈�
-            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 1800000){
+            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 1800000) {
                 Http.response(response, BaseRes.DENIED);
                 return false;
             }
@@ -137,7 +141,7 @@
             // 鎿嶄綔鏃ュ織
             if (!Cools.isEmpty(memo)) {
                 // 杩涜婵�娲诲垽鏂�
-                if (!SystemProperties.SYSTEM_ACTIVATION) {
+                if (!licenseTimer.getSystemSupport()) {
                     Http.response(response, BaseRes.NO_ACTIVATION);
                     return false;
                 }
@@ -150,7 +154,7 @@
 //                request.setAttribute("operateLog", operateLog);
             }
             return true;
-        } catch (Exception e){
+        } catch (Exception e) {
             Http.response(response, BaseRes.DENIED);
             return false;
         }
@@ -159,6 +163,7 @@
 
     /**
      * 鏉冮檺鎷︽埅
+     *
      * @return false:鏃犳潈闄�;   true:璁よ瘉閫氳繃
      */
     private boolean limit(String action, User user) {
@@ -176,7 +181,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