From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 19:13:58 +0800
Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 287d4c5..ccfae25 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,14 +1,17 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +40,9 @@
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private ISysUserService iSysUserService;
+
/**
* 鐧诲綍鏂规硶
*
@@ -54,6 +60,15 @@
return AjaxResult.success(ajax);
}
+ @PostMapping("/logout")
+ public AjaxResult logout(){
+ try {
+ StpUtil.logout();
+ } catch (NotLoginException e) {
+ }
+ return AjaxResult.success("閫�鍑烘垚鍔�");
+ }
+
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
*
@@ -62,7 +77,7 @@
@GetMapping("getInfo")
public AjaxResult getInfo()
{
- SysUser user = SecurityUtils.getLoginUser().getUser();
+ SysUser user = SecurityUtils.getUser();
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -82,8 +97,7 @@
@GetMapping("getRouters")
public AjaxResult getRouters()
{
- Long userId = SecurityUtils.getUserId();
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(SecurityUtils.getUserId());
return AjaxResult.success(menuService.buildMenus(menus));
}
}
--
Gitblit v1.9.3