From e85334bacd8ee7460a7d2bf81fe560a9d16b95c7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 16 七月 2020 13:14:01 +0800
Subject: [PATCH] 修复 生成器业务名 只会截取表下划线的最后一个 导致很多controller 会重名 问题
---
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 09a5d13..fae64fe 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;
@@ -40,18 +42,16 @@
/**
* 鐧诲綍鏂规硶
*
- * @param username 鐢ㄦ埛鍚�
- * @param password 瀵嗙爜
- * @param captcha 楠岃瘉鐮�
- * @param uuid 鍞竴鏍囪瘑
+ * @param loginBody 鐧婚檰淇℃伅
* @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.3