Commit 02e828b9 authored by EDY's avatar EDY

bug

parent bbb5be16
...@@ -78,6 +78,7 @@ public class BaseCustomInfoController extends BaseController ...@@ -78,6 +78,7 @@ public class BaseCustomInfoController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BaseCustomInfo baseCustomInfo) public AjaxResult add(@RequestBody BaseCustomInfo baseCustomInfo)
{ {
baseCustomInfo.setFzr(getUsername());
return toAjax(baseCustomInfoService.insertBaseCustomInfo(baseCustomInfo)); return toAjax(baseCustomInfoService.insertBaseCustomInfo(baseCustomInfo));
} }
......
...@@ -50,8 +50,7 @@ public class SysLoginController ...@@ -50,8 +50,7 @@ public class SysLoginController
{ {
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
// 生成令牌 // 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), String token = loginService.login(loginBody.getUsername(), loginBody.getPassword());
loginBody.getUuid());
ajax.put(Constants.TOKEN, token); ajax.put(Constants.TOKEN, token);
return ajax; return ajax;
} }
......
...@@ -57,14 +57,12 @@ public class SysLoginService ...@@ -57,14 +57,12 @@ public class SysLoginService
* *
* @param username 用户名 * @param username 用户名
* @param password 密码 * @param password 密码
* @param code 验证码
* @param uuid 唯一标识
* @return 结果 * @return 结果
*/ */
public String login(String username, String password, String code, String uuid) public String login(String username, String password)
{ {
// 验证码校验 // // 验证码校验
validateCaptcha(username, code, uuid); // validateCaptcha(username, code, uuid);
// 登录前置校验 // 登录前置校验
loginPreCheck(username, password); loginPreCheck(username, password);
// 用户验证 // 用户验证
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment