From 7e0bf069603e6e3f088fd064f815b48931f9fa2c Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Tue, 14 Nov 2023 20:49:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lihongjie/coal/base/dto/IdRequest.java    | 11 ++++++++++-
 .../coal/loginUser/service/LoginUserService.java | 16 +++++++++++++++-
 .../lihongjie/coal/session/SessionService.java   | 13 ++-----------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/base/dto/IdRequest.java b/src/main/java/cn/lihongjie/coal/base/dto/IdRequest.java
index 50402ab7..f923e566 100644
--- a/src/main/java/cn/lihongjie/coal/base/dto/IdRequest.java
+++ b/src/main/java/cn/lihongjie/coal/base/dto/IdRequest.java
@@ -6,7 +6,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -16,6 +15,16 @@ public class IdRequest {
     private String id;
     private List<String> ids;
 
+    public IdRequest(String id) {
+        this.id = id;
+    }
+
+    public IdRequest(List<String> ids) {
+        this.ids = ids;
+    }
+
+    public IdRequest() {}
+
     public List<String> getIds() {
 
         if (StringUtils.isEmpty(id)) {
diff --git a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
index e2a5cca1..ff83a2b9 100644
--- a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
+++ b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
@@ -4,6 +4,7 @@ import cn.lihongjie.coal.base.dto.CommonQuery;
 import cn.lihongjie.coal.base.dto.IdRequest;
 import cn.lihongjie.coal.base.service.BaseService;
 import cn.lihongjie.coal.common.Constants;
+import cn.lihongjie.coal.common.Ctx;
 import cn.lihongjie.coal.loginUser.dto.CreateLoginUserDto;
 import cn.lihongjie.coal.loginUser.dto.LoginUserDto;
 import cn.lihongjie.coal.loginUser.dto.UpdateLoginUserDto;
@@ -12,6 +13,7 @@ import cn.lihongjie.coal.loginUser.mapper.LoginUserMapper;
 import cn.lihongjie.coal.loginUser.repository.LoginUserRepository;
 import cn.lihongjie.coal.session.SessionService;
 import cn.lihongjie.coal.sysconfig.service.SysConfigService;
+import cn.lihongjie.coal.user.service.UserService;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
@@ -203,7 +205,19 @@ public class LoginUserService extends BaseService<LoginUserEntity, LoginUserRepo
 
     @Autowired SessionService sessionService;
 
+    @Autowired UserService userService;
+
     public void logout(IdRequest request) {
-        sessionService.logout(request.getId());
+        String sessionId = request.getId();
+        if (sessionId != null) {
+
+            this.deleteLogin(sessionId);
+            try {
+
+                userService.clearUserCache(Ctx.currentUser().getId());
+            } catch (Exception e) {
+                log.warn("清除用户缓存失败", e);
+            }
+        }
     }
 }
diff --git a/src/main/java/cn/lihongjie/coal/session/SessionService.java b/src/main/java/cn/lihongjie/coal/session/SessionService.java
index f7880688..7dead2e4 100644
--- a/src/main/java/cn/lihongjie/coal/session/SessionService.java
+++ b/src/main/java/cn/lihongjie/coal/session/SessionService.java
@@ -1,7 +1,7 @@
 package cn.lihongjie.coal.session;
 
+import cn.lihongjie.coal.base.dto.IdRequest;
 import cn.lihongjie.coal.common.Constants;
-import cn.lihongjie.coal.common.Ctx;
 import cn.lihongjie.coal.common.RequestUtils;
 import cn.lihongjie.coal.exception.BizException;
 import cn.lihongjie.coal.ip.IpQueryService;
@@ -201,16 +201,7 @@ public class SessionService {
 
     public void logout(String sessionId) {
 
-        if (sessionId != null) {
-
-            loginUserService.deleteLogin(sessionId);
-            try {
-
-                userService.clearUserCache(Ctx.currentUser().getId());
-            } catch (Exception e) {
-                log.warn("清除用户缓存失败", e);
-            }
-        }
+        loginUserService.logout(new IdRequest(sessionId));
     }
 
     public void anonymousSession() {