From 42b7628a166c8484567bd82eb0f1b13e9ae92f22 Mon Sep 17 00:00:00 2001
From: chenyouting <514333061@qq.com>
Date: Tue, 1 Jul 2025 14:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/AppAuthController.java        |  2 +-
 .../fuyuanshen/app/service/AppLoginService.java  | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
index ec51fef..2d0a140 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
@@ -98,7 +98,7 @@ public class AppAuthController {
      */
     @PostMapping("/logout")
     public R<Void> logout() {
-        loginService.logout();
+//        loginService.logout();
         return R.ok("退出成功");
     }
 
diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
index 688816b..ac9f9e3 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
@@ -31,10 +31,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Supplier;
 
 /**
@@ -54,7 +51,7 @@ public class AppLoginService {
     private Integer lockTime;
 
     private final ISysTenantService tenantService;
-    private final IAppRoleService roleService;
+    private final IAppRoleService appRoleService;
 
 
     /**
@@ -66,7 +63,7 @@ public class AppLoginService {
     /**
      * 退出登录
      */
-    public void logout() {
+    /*public void logout() {
         try {
             AppLoginUser loginUser = AppLoginHelper.getLoginUser();
             if (ObjectUtil.isNull(loginUser)) {
@@ -84,7 +81,7 @@ public class AppLoginService {
             } catch (NotLoginException ignored) {
             }
         }
-    }
+    }*/
 
     /**
      * 记录登录信息
@@ -119,8 +116,9 @@ public class AppLoginService {
         Set<String> perms = new HashSet<>();
         loginUser.setMenuPermission(perms);
         loginUser.setRolePermission(perms);
-        List<AppRoleVo> roles = roleService.selectRolesByUserId(userId);
-        loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
+        loginUser.setRoles(new ArrayList<>());
+/*        List<AppRoleVo> roles = appRoleService.selectRolesByUserId(userId);
+        loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));*/
         return loginUser;
     }