From 17c94afc50e7957b8fd98413cdc9cbbdc4c7967a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 18 Jul 2024 17:41:19 +0800
Subject: [PATCH] 逻辑

---
 src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java b/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
index 412fcf3..2814716 100644
--- a/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
+++ b/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
@@ -4,7 +4,8 @@
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.utils.RedisUtils;
 import cc.mrbird.febs.common.utils.SpringContextUtil;
-import cc.mrbird.febs.modules.api.entity.MemberEntity;
+import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.mapper.DappMemberDao;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
@@ -29,27 +30,32 @@
 
     private final RedisUtils redisUtils = SpringContextUtil.getBean(RedisUtils.class);
 
+    private final DappMemberDao dappMemberDao = SpringContextUtil.getBean(DappMemberDao.class);
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String headerToken = request.getHeader("token");
+        System.out.println(request.getHeader(":path"));
+        String headerToken = request.getHeader("key");
         if (StringUtils.isBlank(headerToken)) {
             responseUnAuth(response);
             return false;
         }
 
-        String token = resolveToken(headerToken);
-
-        if (token == null || AppContants.TIME_OUT.equals(token)) {
-            responseUnAuth(response);
-            return false;
-        }
-
-        String userJsonStr = redisUtils.getString(token);
+        String userJsonStr = redisUtils.getString(headerToken);
         if (StringUtils.isBlank(userJsonStr)) {
             responseUnAuth(response);
             return false;
         }
-        MemberEntity member = JSON.parseObject(userJsonStr, MemberEntity.class);
+        DappMemberEntity member = JSON.parseObject(userJsonStr, DappMemberEntity.class);
+        DappMemberEntity memberEntity = dappMemberDao.selectById(member.getId());
+        if (memberEntity == null) {
+            responseUnAuth(response);
+            return false;
+        }
+        if(AppContants.INT_FLAG_Y != memberEntity.getAccountStatus()){
+            responseUnAuth(response);
+            return false;
+        }
 
         request.getSession().setAttribute("member", member);
         return true;

--
Gitblit v1.9.1