From 4104bdb8111c9a2af27d6d25a87893e8935330da Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Nov 2022 11:09:15 +0800
Subject: [PATCH] 20221124
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 10 ++++++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 4 ++--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 41fcfcc..ea1871a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -13,6 +13,8 @@
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.vo.*;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -125,7 +127,15 @@
@PostMapping(value = "/logOut")
public FebsResponse logout() {
DappMemberEntity member = LoginUserUtil.getAppUser();
+
String redisKey = AppContants.REDIS_KEY_SIGN + member.getId();
+ 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();
}
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 e243291..eb24deb 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
@@ -708,7 +708,6 @@
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);
@@ -716,6 +715,7 @@
redisUtils.del(existToken);
}
}
+ redisUtils.del(redisKey);
}
@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 6fb4bdf..0d97b5a 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
@@ -944,9 +944,9 @@
Object o = redisUtils.get(existToken);
if (ObjectUtil.isNotEmpty(o)) {
redisUtils.del(existToken);
- redisUtils.del(redisKey);
}
}
+ redisUtils.del(redisKey);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
@@ -988,9 +988,9 @@
Object o = redisUtils.get(existToken);
if (ObjectUtil.isNotEmpty(o)) {
redisUtils.del(existToken);
- redisUtils.del(redisKey);
}
}
+ redisUtils.del(redisKey);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
--
Gitblit v1.9.1