From 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 23 六月 2025 20:20:58 +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, 6 insertions(+), 1 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 a8b5321..25adffc 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
@@ -48,10 +48,13 @@
public AjaxResult login(@RequestBody LoginBody loginBody)
{
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ System.out.println(loginBody);
+ String token = loginService.login(loginBody.getNickname(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
+
HashMap<String, String> tokenMap = new HashMap<>();
tokenMap.put("token",token);
+ // tokenMap.put("roid",roid)
return AjaxResult.success(tokenMap);
}
@@ -81,6 +84,8 @@
public AjaxResult getInfo()
{
SysUser user = SecurityUtils.getLoginUser().getUser();
+ // System.out.println(user);
+// System.out.println("===========0oiii999999999999999-000000000000000000");
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
--
Gitblit v1.9.1