From 3706d2e1db45e64a1375b92300901de39e35e464 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 25 一月 2022 21:50:54 +0800
Subject: [PATCH] update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 90 +++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 40 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 b2df955..3c51e09 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
@@ -1,95 +1,105 @@
package com.ruoyi.web.controller.system;
+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.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.utils.ServletUtils;
-import com.ruoyi.framework.web.service.SysLoginService;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.system.service.SysLoginService;
+import com.ruoyi.system.service.SysPermissionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
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;
/**
* 鐧诲綍楠岃瘉
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
+@Validated
+@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠＄悊"})
+@RequiredArgsConstructor
@RestController
-public class SysLoginController
-{
- @Autowired
- private SysLoginService loginService;
+public class SysLoginController {
- @Autowired
- private ISysMenuService menuService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Autowired
- private TokenService tokenService;
+ private final SysLoginService loginService;
+ private final ISysMenuService menuService;
+ private final SysPermissionService permissionService;
/**
* 鐧诲綍鏂规硶
- *
+ *
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
+ @ApiOperation("鐧诲綍鏂规硶")
@PostMapping("/login")
- public AjaxResult login(@RequestBody LoginBody loginBody)
- {
- AjaxResult ajax = AjaxResult.success();
+ public AjaxResult<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());
+ loginBody.getUuid());
ajax.put(Constants.TOKEN, token);
- return ajax;
+ return AjaxResult.success(ajax);
+ }
+
+ @ApiOperation("鐧诲嚭鏂规硶")
+ @PostMapping("/logout")
+ public AjaxResult<Void> logout() {
+ try {
+ StpUtil.logout();
+ } catch (NotLoginException e) {
+ }
+ return AjaxResult.success("閫�鍑烘垚鍔�");
}
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
- *
+ *
* @return 鐢ㄦ埛淇℃伅
*/
+ @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("getInfo")
- public AjaxResult getInfo()
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- SysUser user = loginUser.getUser();
+ public AjaxResult<Map<String, Object>> getInfo() {
+ SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
Set<String> permissions = permissionService.getMenuPermission(user);
- AjaxResult ajax = AjaxResult.success();
+ Map<String, Object> ajax = new HashMap<>();
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
- return ajax;
+ return AjaxResult.success(ajax);
}
/**
* 鑾峰彇璺敱淇℃伅
- *
+ *
* @return 璺敱淇℃伅
*/
+ @ApiOperation("鑾峰彇璺敱淇℃伅")
@GetMapping("getRouters")
- public AjaxResult getRouters()
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- // 鐢ㄦ埛淇℃伅
- SysUser user = loginUser.getUser();
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+ public AjaxResult<List<RouterVo>> getRouters() {
+ Long userId = LoginHelper.getUserId();
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus));
}
}
--
Gitblit v1.9.3