From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 b3053e5..94b9e87 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,7 +3,10 @@
import java.util.List;
import java.util.Set;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSort;
import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +32,7 @@
*/
@RestController
@Api(tags = "鐧诲綍楠岃瘉鎺ュ彛")
+@ApiSort(1)
@Anonymous
public class SysLoginController {
@Autowired
@@ -48,6 +52,7 @@
*/
@PostMapping("/login")
@ApiOperation(value = "鐧诲綍")
+ @ApiOperationSupport(order = 1)
public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
@@ -64,6 +69,7 @@
*/
@GetMapping("getInfo")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅")
+ @ApiOperationSupport(order = 2)
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
// 璧嬪�艰瀺浜憈oken鍒扮敤鎴蜂俊鎭�
@@ -91,6 +97,7 @@
@GetMapping("getRouters")
public AjaxResult getRouters() {
String userId = SecurityUtils.getUserId();
+ PageUtils.clearPage();//淇鍒嗛〉缂撳瓨鑾峰彇涓嶅埌浜岀骇鑿滃崟鐨勯棶棰�
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus));
}
--
Gitblit v1.9.3