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 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 perms = new HashSet<>(); loginUser.setMenuPermission(perms); loginUser.setRolePermission(perms); - List roles = roleService.selectRolesByUserId(userId); - loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); + loginUser.setRoles(new ArrayList<>()); +/* List roles = appRoleService.selectRolesByUserId(userId); + loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));*/ return loginUser; }