jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/router/index.js
This commit is contained in:
疯狂的狮子li
2021-07-24 19:03:36 +08:00
parent b539939a90 c43f9bc3c2
commit fbe9ad2392
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@ -65,7 +65,7 @@ public class SysLoginService
// 验证码开关
if (captchaOnOff)
{
validateCapcha(username, code, uuid, request);
validateCaptcha(username, code, uuid, request);
}
// 用户验证
Authentication authentication = null;
@ -103,7 +103,7 @@ public class SysLoginService
* @param uuid 唯一标识
* @return 结果
*/
public void validateCapcha(String username, String code, String uuid, HttpServletRequest request) {
public void validateCaptcha(String username, String code, String uuid, HttpServletRequest request) {
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);