From 42128cb41c46b240f18f4aa132c142db0138b3ed Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 17 十月 2022 17:53:49 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/interceptor/AuthInterceptor.java |   34 +++++++++++++++-------------------
 1 files changed, 15 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 4e03e05..fe649c0 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -1,10 +1,8 @@
 package com.lf.server.interceptor;
 
 import com.alibaba.fastjson.JSON;
-import com.lf.server.entity.all.HttpStatus;
-import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.all.StaticData;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.all.*;
+import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.helper.WebHelper;
 import com.lf.server.service.sys.TokenService;
@@ -31,6 +29,7 @@
 
     private static final String NO_LOGIN = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.NO_LOGIN_ERROR, "鐢ㄦ埛鏈櫥褰�"));
 
+    private static final String USER_LOCK = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.USER_LOCK_ERROR, "鐢ㄦ埛ID宸茬鐢�"));
 
     public AuthInterceptor(TokenService tokenService) {
         this.tokenService = tokenService;
@@ -47,35 +46,32 @@
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         try {
-            System.out.println(request.getRequestURI().toLowerCase() + "," + (handler instanceof HandlerMethod));
-
-            // 闈炴柟娉曪紝鏃犻渶鎷︽埅
-            if (!(handler instanceof HandlerMethod)) {
-                return true;
-            }
-
-            // 鏃犻渶鎺堟潈
-            if (noNeedAuth(request)) {
+            System.out.println(request.getRequestURI().toLowerCase() + ", " + (handler instanceof HandlerMethod));
+            // 闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
+            if (!(handler instanceof HandlerMethod) || noNeedAuth(request)) {
                 return true;
             }
 
             String token = WebHelper.getToken(request);
             if (StringHelper.isNull(token)) {
-                WebHelper.write2Page(response, NO_TOKEN);
-                return false;
+                return WebHelper.write2Page(response, NO_TOKEN);
             }
 
-            UsersEntity ue = tokenService.getCurrentUser(request);
+            UserEntity ue = tokenService.getCurrentUser(request);
             if (ue == null) {
-                WebHelper.write2Page(response, NO_LOGIN);
-                return false;
+                return WebHelper.write2Page(response, NO_LOGIN);
             }
 
+            if (tokenService.isUidDisable(ue)) {
+                return WebHelper.write2Page(response, USER_LOCK);
+            }
+
+            // noinspection AlibabaRemoveCommentedCode
             // 鏉冮檺鏍¢獙
 
             return true;
         } catch (Exception ex) {
-            log.error(ex.getStackTrace());
+            log.error(ex.getMessage() + ex.getStackTrace() + "\n");
             return false;
         }
     }

--
Gitblit v1.9.3