From 53da7140c2683e4d80c0b2536b7972d9c516729a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期六, 29 一月 2022 11:48:41 +0800 Subject: [PATCH] update 调整返回类型为 R --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 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 3c51e09..3a033e5 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 @@ -3,15 +3,14 @@ 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.R; 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.service.UserService; import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.spring.SpringUtils; 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 io.swagger.annotations.Api; @@ -41,6 +40,7 @@ private final SysLoginService loginService; private final ISysMenuService menuService; + private final ISysUserService userService; private final SysPermissionService permissionService; /** @@ -51,23 +51,23 @@ */ @ApiOperation("鐧诲綍鏂规硶") @PostMapping("/login") - public AjaxResult<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) { + public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) { Map<String, Object> ajax = new HashMap<>(); // 鐢熸垚浠ょ墝 String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid()); ajax.put(Constants.TOKEN, token); - return AjaxResult.success(ajax); + return R.ok(ajax); } @ApiOperation("鐧诲嚭鏂规硶") @PostMapping("/logout") - public AjaxResult<Void> logout() { + public R<Void> logout() { try { StpUtil.logout(); } catch (NotLoginException e) { } - return AjaxResult.success("閫�鍑烘垚鍔�"); + return R.ok("閫�鍑烘垚鍔�"); } /** @@ -77,8 +77,8 @@ */ @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅") @GetMapping("getInfo") - public AjaxResult<Map<String, Object>> getInfo() { - SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId()); + public R<Map<String, Object>> getInfo() { + SysUser user = userService.selectUserById(LoginHelper.getUserId()); // 瑙掕壊闆嗗悎 Set<String> roles = permissionService.getRolePermission(user); // 鏉冮檺闆嗗悎 @@ -87,7 +87,7 @@ ajax.put("user", user); ajax.put("roles", roles); ajax.put("permissions", permissions); - return AjaxResult.success(ajax); + return R.ok(ajax); } /** @@ -97,9 +97,9 @@ */ @ApiOperation("鑾峰彇璺敱淇℃伅") @GetMapping("getRouters") - public AjaxResult<List<RouterVo>> getRouters() { + public R<List<RouterVo>> getRouters() { Long userId = LoginHelper.getUserId(); List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId); - return AjaxResult.success(menuService.buildMenus(menus)); + return R.ok(menuService.buildMenus(menus)); } } -- Gitblit v1.9.3