From 394935af53da986ae1108b3d08022279781f8f34 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 26 十月 2022 16:57:56 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/interceptor/AuthInterceptor.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index 4389d7c..2b49a65 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -5,6 +5,7 @@
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.helper.WebHelper;
+import com.lf.server.service.all.SysService;
 import com.lf.server.service.sys.TokenService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -22,7 +23,7 @@
  */
 @Configuration
 public class AuthInterceptor implements HandlerInterceptor {
-    private TokenService tokenService;
+    private SysService sysService;
 
     private static final Log log = LogFactory.getLog(AuthInterceptor.class);
 
@@ -34,8 +35,8 @@
 
     private static final String NO_AUTH = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.NO_AUTH_ERROR, "鏃犳潈闄愯闂�"));
 
-    public AuthInterceptor(TokenService tokenService) {
-        this.tokenService = tokenService;
+    public AuthInterceptor(SysService sysService) {
+        this.sysService = sysService;
     }
 
     /**
@@ -55,12 +56,15 @@
                 return WebHelper.write2Page(response, NO_TOKEN);
             }
 
-            UserEntity ue = tokenService.getCurrentUser(request);
+            //String ip = WebHelper.getIpAddress(request);
+            //List<String> blackList=
+
+            UserEntity ue = sysService.tokenService.getCurrentUser(request);
             if (ue == null) {
                 return WebHelper.write2Page(response, NO_LOGIN);
             }
 
-            if (tokenService.isUidDisable(ue)) {
+            if (sysService.tokenService.isUidDisable(ue)) {
                 return WebHelper.write2Page(response, USER_LOCK);
             }
 
@@ -95,7 +99,7 @@
      * 妫�鏌ユ潈闄�
      */
     private boolean checkPerms(UserEntity ue, HttpServletRequest request) {
-        List<String> list = tokenService.permsService.selectPerms(ue.getUid());
+        List<String> list = sysService.permsService.selectPerms(ue.getUid());
         if (list == null || list.size() == 0) {
             return false;
         }

--
Gitblit v1.9.3