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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 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 5054b31..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
@@ -5,6 +5,7 @@
import java.util.Set;
import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.framework.web.domain.server.Sys;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -47,12 +48,32 @@
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);
+ }
+
+ /**
+ * 鐧诲綍鏂规硶锛堜笉闇�瑕侀獙璇佺爜锛�
+ *
+ * @param loginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/login/no")
+ public AjaxResult login2(@RequestBody LoginBody loginBody)
+ {
+ // 鐢熸垚浠ょ墝
+ String token = loginService.loginWithoutValidate(loginBody.getUsername(), loginBody.getPassword());
HashMap<String, String> tokenMap = new HashMap<>();
tokenMap.put("token",token);
return AjaxResult.success(tokenMap);
}
+
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
@@ -63,10 +84,13 @@
public AjaxResult getInfo()
{
SysUser user = SecurityUtils.getLoginUser().getUser();
+ // System.out.println(user);
+// System.out.println("===========0oiii999999999999999-000000000000000000");
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
Set<String> permissions = permissionService.getMenuPermission(user);
+ System.out.println(permissions);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
@@ -83,7 +107,9 @@
public AjaxResult getRouters()
{
Long userId = SecurityUtils.getUserId();
+ System.out.println("9222222222kkkkkkkkkkksssssssssssssssssss");
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);//杩欓噷涔嬪悗宸茬粡鐢熸垚浜嗘爲褰㈢粨鏋�
+ System.out.println(menus);
return AjaxResult.success(menuService.buildMenus(menus));//杩欓噷涔嬪悗灏卞皝瑁呭ソ浜嗗彂缁欏墠绔殑vo
}
}
--
Gitblit v1.9.1