From 032d6f341f43488d0a430e6fcb2da5ba67e2eda4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 05 Sep 2024 02:45:43 +0800
Subject: [PATCH] 1
---
src/main/java/project/web/admin/security/LoginController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/project/web/admin/security/LoginController.java b/src/main/java/project/web/admin/security/LoginController.java
index 7178df3..9ba663c 100644
--- a/src/main/java/project/web/admin/security/LoginController.java
+++ b/src/main/java/project/web/admin/security/LoginController.java
@@ -86,10 +86,13 @@
modelAndView.setViewName("login");
return modelAndView;
}
-
+
+ //用户名错误(找不到用户)或用户无权限则返回登录页面
+ SecUser user = this.secUserService.findValidUserByLoginName(username,loginRoles());
+
//谷歌验证码不正确则返回登录页面
Syspara para = sysparaService.find("open_google_auth_code");
- if (null == para || "true".equals(para.getValue())) {
+ if (null != para && "true".equals(para.getValue()) && user.isGoogle_auth_bind()) {
try {
googleAuthService.checkGoogleAuthCodeForLogin(this.getIp(), username, googleAuthCode, getRequest().getRequestURI());
} catch (BusinessException e) {
@@ -103,8 +106,6 @@
}
}
- //用户名错误(找不到用户)或用户无权限则返回登录页面
- SecUser user = this.secUserService.findValidUserByLoginName(username,loginRoles());
if (null==user) {
modelAndView.addObject("error", "未找到用户或用户无权限!");
modelAndView.setViewName("login");
--
Gitblit v1.9.3