From 463363f6ef3f5761a074016cc7d61778db0d6cd9 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Wed, 18 Oct 2023 17:33:05 +0800
Subject: [PATCH] rtu管理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 780665c..497f239 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
@@ -4,6 +4,7 @@
import java.util.Set;
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;
@@ -24,14 +25,13 @@
/**
* 登录验证
- *
+ *
* @author ruoyi
*/
@RestController
@Api(tags = "登录验证接口")
@Anonymous
-public class SysLoginController
-{
+public class SysLoginController {
@Autowired
private SysLoginService loginService;
@@ -43,32 +43,36 @@
/**
* 登录方法
- *
+ *
* @param loginBody 登录信息
* @return 结果
*/
@PostMapping("/login")
@ApiOperation(value = "登录")
- 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(),
- loginBody.getUuid(),loginBody.getApp());
+ loginBody.getUuid());
ajax.put(Constants.TOKEN, token);
return ajax;
}
/**
* 获取用户信息
- *
+ *
* @return 用户信息
*/
@GetMapping("getInfo")
@ApiOperation(value = "获取用户信息")
- public AjaxResult getInfo()
- {
+ public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
+ // 赋值融云token到用户信息
+ String rongCloudToken = SecurityUtils.getLoginUser().getRongCloudToken();
+ if (rongCloudToken != null) {
+ user.setRongCloudToken(rongCloudToken);
+ }
+
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
@@ -82,13 +86,13 @@
/**
* 获取路由信息
- *
+ *
* @return 路由信息
*/
@GetMapping("getRouters")
- public AjaxResult 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