提交 13a0ad96 作者: 陈柏江

用户信息返回格式修改

上级 0a89c1ad
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
...@@ -21,6 +11,16 @@ import com.ruoyi.framework.web.service.SysLoginService; ...@@ -21,6 +11,16 @@ import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService; import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService; 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;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* 登录验证 * 登录验证
...@@ -49,11 +49,9 @@ public class SysLoginController { ...@@ -49,11 +49,9 @@ public class SysLoginController {
*/ */
@PostMapping("/login") @PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody) { public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
// 生成令牌 // 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid()); loginBody.getUuid());
ajax.put(Constants.TOKEN, token);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put(Constants.TOKEN, token); map.put(Constants.TOKEN, token);
return AjaxResult.success(map); return AjaxResult.success(map);
...@@ -76,11 +74,11 @@ public class SysLoginController { ...@@ -76,11 +74,11 @@ public class SysLoginController {
loginUser.setPermissions(permissions); loginUser.setPermissions(permissions);
tokenService.refreshToken(loginUser); tokenService.refreshToken(loginUser);
} }
AjaxResult ajax = AjaxResult.success(); Map<String, Object> map = new HashMap<>();
ajax.put("user", user); map.put("user", user);
ajax.put("roles", roles); map.put("roles", roles);
ajax.put("permissions", permissions); map.put("permissions", permissions);
return ajax; return AjaxResult.success(map);
} }
/** /**
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论