dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复编译报错问题

Browse Source
This commit is contained in:
chenyouting
2025-07-01 14:30:06 +08:00
parent 86e3c1f455
commit 42b7628a16
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
View File

@ -98,7 +98,7 @@ public class AppAuthController {
*/ */
@PostMapping("/logout") @PostMapping("/logout")
public R<Void> logout() { public R<Void> logout() {
loginService.logout(); // loginService.logout();
return R.ok("退出成功"); return R.ok("退出成功");
} }

16
fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
View File

@ -31,10 +31,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.Duration; import java.time.Duration;
import java.util.Date; import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
@ -54,7 +51,7 @@ public class AppLoginService {
private Integer lockTime; private Integer lockTime;
private final ISysTenantService tenantService; 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 { try {
AppLoginUser loginUser = AppLoginHelper.getLoginUser(); AppLoginUser loginUser = AppLoginHelper.getLoginUser();
if (ObjectUtil.isNull(loginUser)) { if (ObjectUtil.isNull(loginUser)) {
@ -84,7 +81,7 @@ public class AppLoginService {
} catch (NotLoginException ignored) { } catch (NotLoginException ignored) {
} }
} }
} }*/
/** /**
* 记录登录信息 * 记录登录信息
@ -119,8 +116,9 @@ public class AppLoginService {
Set<String> perms = new HashSet<>(); Set<String> perms = new HashSet<>();
loginUser.setMenuPermission(perms); loginUser.setMenuPermission(perms);
loginUser.setRolePermission(perms); loginUser.setRolePermission(perms);
List<AppRoleVo> roles = roleService.selectRolesByUserId(userId); loginUser.setRoles(new ArrayList<>());
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); /* List<AppRoleVo> roles = appRoleService.selectRolesByUserId(userId);
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));*/
return loginUser; return loginUser;
} }