From ef5adf2e2a4134fd06ae1432df96434de0538ec3 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Thu, 04 Jun 2020 14:53:24 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 修复退出登录重定向到登录页，登录后参数丢失。/article?id=6
---
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index d7bf923..6871d83 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -5,9 +5,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.security.LoginBody;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.service.SysLoginService;
import com.ruoyi.framework.security.service.SysPermissionService;
@@ -47,11 +49,12 @@
* @return 结果
*/
@PostMapping("/login")
- public AjaxResult login(String username, String password, String code, String uuid)
+ public AjaxResult login(@RequestBody LoginBody loginBody)
{
AjaxResult ajax = AjaxResult.success();
// 生成令牌
- String token = loginService.login(username, password, code, uuid);
+ String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ loginBody.getUuid());
ajax.put(Constants.TOKEN, token);
return ajax;
}
--
Gitblit v1.9.2