From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 7a8ffa8..6f86adf 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -41,6 +41,7 @@
@Resource
private SysUserClient sysUserClient;
+
@PostMapping("login")
@ApiOperation(value = "登录", tags = "后台-登录")
public R<?> login(@RequestBody LoginBody form) {
@@ -55,6 +56,8 @@
}
map.put("roleName", roles);
map.put("info", userInfo);
+ // 权限集合
+ map.put("permissions", userInfo.getPermissions());
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
sysUser.setUserId(userInfo.getSysUser().getUserId());
--
Gitblit v1.7.1