From 600e7e97ef08a03b4d1e142ae9a364317a86e683 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Nov 2022 10:58:03 +0800
Subject: [PATCH] 20221124

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   24 ++++++++++++++++++++++--
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   10 ++++++++++
 src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java     |    6 ++++++
 3 files changed, 38 insertions(+), 2 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 fbfa769..17bb17c 100644
--- a/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
+++ b/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
@@ -5,6 +5,7 @@
 import cc.mrbird.febs.common.utils.RedisUtils;
 import cc.mrbird.febs.common.utils.SpringContextUtil;
 import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
@@ -47,6 +48,11 @@
             return false;
         }
 
+        if(ObjectUtil.isEmpty(redisUtils.getString(token))){
+            responseUnAuth(response);
+            return false;
+        }
+
         String userJsonStr = redisUtils.getString(token);
 
         if (StringUtils.isBlank(userJsonStr)) {
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index cc78f35..e243291 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -706,6 +706,16 @@
         String md5Pwd = SecureUtil.md5(AppContants.MEMBER_LOGIN_CODE);
         member.setPassword(md5Pwd);
         dappMemberDao.updateById(member);
+
+        String redisKey = AppContants.REDIS_KEY_SIGN + member.getId();
+        redisUtils.del(redisKey);
+        String existToken = redisUtils.getString(redisKey);
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+            }
+        }
     }
 
     @Override
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 7cdb187..6fb4bdf 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -935,8 +935,18 @@
         memberEntity.setPassword(SecureUtil.md5(newTransferPassword));
         dappMemberDao.updateById(memberEntity);
 
+//        String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+//        redisUtils.del(redisKey);
+
         String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
-        redisUtils.del(redisKey);
+        String existToken = redisUtils.getString(redisKey);
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+                redisUtils.del(redisKey);
+            }
+        }
 
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
     }
@@ -969,8 +979,18 @@
         memberEntity.setPassword(SecureUtil.md5(newPassword));
         dappMemberDao.updateById(memberEntity);
 
+//        String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+//        redisUtils.del(redisKey);
+
         String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
-        redisUtils.del(redisKey);
+        String existToken = redisUtils.getString(redisKey);
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+                redisUtils.del(redisKey);
+            }
+        }
 
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
     }

--
Gitblit v1.9.1