From e729a924d4b2003f080edbec2455b4e7a1eb5d1e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 21 十二月 2022 10:41:32 +0800
Subject: [PATCH] update 优化 验证码结果使用spel引擎自动计算
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 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 65e11f2..78c44e3 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
@@ -6,13 +6,13 @@
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.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.SmsLoginBody;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.system.domain.vo.RouterVo;
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 lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +24,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* 鐧诲綍楠岃瘉
@@ -39,7 +38,6 @@
private final SysLoginService loginService;
private final ISysMenuService menuService;
private final ISysUserService userService;
- private final SysPermissionService permissionService;
/**
* 鐧诲綍鏂规硶
@@ -107,15 +105,12 @@
*/
@GetMapping("getInfo")
public R<Map<String, Object>> getInfo() {
- SysUser user = userService.selectUserById(LoginHelper.getUserId());
- // 瑙掕壊闆嗗悎
- Set<String> roles = permissionService.getRolePermission(user);
- // 鏉冮檺闆嗗悎
- Set<String> permissions = permissionService.getMenuPermission(user);
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ SysUser user = userService.selectUserById(loginUser.getUserId());
Map<String, Object> ajax = new HashMap<>();
ajax.put("user", user);
- ajax.put("roles", roles);
- ajax.put("permissions", permissions);
+ ajax.put("roles", loginUser.getRolePermission());
+ ajax.put("permissions", loginUser.getMenuPermission());
return R.ok(ajax);
}
--
Gitblit v1.9.3