From c92aa3899e11a355cddfcfeaececcc843d7ad1bb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 九月 2024 19:14:18 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 a9f2046..bb5f7fc 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
@@ -62,14 +62,14 @@
* @return 结果
*/
@ApiOperation(value = "账号密码登录",notes = "账号密码登录")
- @PostMapping("/login")
- public AjaxResult login(@RequestBody LoginBody loginBody)
+ @PostMapping("/login")
+ public AjaxResult<Map<String,Object>> login(@RequestBody LoginBody loginBody)
{
- AjaxResult ajax = AjaxResult.success();
+ Map<String,Object> map = new HashMap<>();
// 生成令牌
LoginUser loginUser = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
- ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
+ map.put(Constants.TOKEN, tokenService.createToken(loginUser));
List<SysRole> roles = loginUser.getUser().getRoles();
if(CollectionUtils.isEmpty(roles)){
return AjaxResult.error("请关联角色!");
@@ -80,10 +80,10 @@
List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
- ajax.put("menus",menus);
- ajax.put("roleName",roles.get(0).getRoleName());
- ajax.put("userInfo",loginUser);
- return ajax;
+ map.put("menus",menus);
+ map.put("roleName",roles.get(0).getRoleName());
+ map.put("userInfo",loginUser);
+ return AjaxResult.success(map);
}
/**
--
Gitblit v1.7.1