From ec17edbc0d74fc08dadbe723278ff8f07841dc30 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 25 二月 2023 10:44:42 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/interceptor/AuthInterceptor.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index ff5cbbd..4ed007c 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -52,43 +52,53 @@
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         // noinspection AlibabaRemoveCommentedCode
         try {
-            // 闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
+            // 1.闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
             if (!(handler instanceof HandlerMethod) || noNeedAuth(request)) {
                 return true;
             }
 
-            // 鑾峰彇浠ょ墝
+            // 2.鑾峰彇浠ょ墝
             String token = WebHelper.getToken(request);
             if (StringHelper.isNull(token)) {
                 return WebHelper.write2Page(response, NO_TOKEN);
             }
 
-            // 鑾峰彇IP锛屾鏌ラ粦鍚嶅崟锛屾鏌ョ櫧鍚嶅崟锛屾鏌P涓�鑷存��
-            String ip = WebHelper.getIpAddress(request);
-            if (StringHelper.isEmpty(ip)) {
-                return WebHelper.write2Page(response, IP_NULL);
-            }
-            if (!checkBlackList(ip, request)) {
-                return WebHelper.write2Page(response, BLACK_LIST);
-            }
-            if (!checkWhiteList(ip, request)) {
-                if (!checkIpSource(ip, token)) {
-                    return WebHelper.write2Page(response, ILLEGAL_TOKEN);
-                }
-            }
-
-            // 鑾峰彇鐢ㄦ埛浠ょ墝
+            // 3.鑾峰彇鐢ㄦ埛浠ょ墝
             UserEntity ue = sysService.tokenService.getCurrentUser(request);
             if (ue == null) {
                 return WebHelper.write2Page(response, NO_LOGIN);
             }
 
-            // 妫�鏌ョ敤鎴稩D鏄惁绂佺敤
+            // 4.鑾峰彇IP
+            String ip = WebHelper.getIpAddress(request);
+            if (StringHelper.isEmpty(ip)) {
+                return WebHelper.write2Page(response, IP_NULL);
+            }
+
+            // 5.妫�鏌ラ粦鍚嶅崟
+            if (!checkBlackList(ip, request)) {
+                return WebHelper.write2Page(response, BLACK_LIST);
+            }
+
+            // 6.admin璺宠繃鏉冮檺妫�娴�
+            if (StaticData.ADMIN.equals(ue.getUid())) {
+                return true;
+            }
+
+            // 7.妫�鏌ョ櫧鍚嶅崟
+            if (!checkWhiteList(ip, request)) {
+                // 妫�鏌P涓�鑷存��
+                if (!checkIpSource(ip, token)) {
+                    return WebHelper.write2Page(response, ILLEGAL_TOKEN);
+                }
+            }
+
+            // 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
             if (sysService.tokenService.isUidDisable(ue)) {
                 return WebHelper.write2Page(response, USER_LOCK);
             }
 
-            // 鏉冮檺鏍¢獙
+            // 9.鏉冮檺鏍¢獙
             if (!checkPerms(ue, request)) {
                 System.out.println("鏃犳潈闄愯闂細" + request.getRequestURI().toLowerCase());
                 return WebHelper.write2Page(response, NO_AUTH);

--
Gitblit v1.9.3