From 94b1a3bde93ad87f9347d8a08d70dd4f2318f1ce Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 17:47:51 +0800
Subject: [PATCH] 修改分享bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 45e5a2b..1fbaeeb 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,9 +1,11 @@
package com.ruoyi.web.controller.system;
+import java.util.HashMap;
import java.util.List;
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;
@@ -45,13 +47,32 @@
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody)
{
- AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
- ajax.put(Constants.TOKEN, token);
- return ajax;
+
+ 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);
+ }
+
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
@@ -66,6 +87,7 @@
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);
@@ -82,7 +104,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