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 | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/main/java/project/web/admin/security/LoginController.java b/src/main/java/project/web/admin/security/LoginController.java
index ebfbb14..9ba663c 100644
--- a/src/main/java/project/web/admin/security/LoginController.java
+++ b/src/main/java/project/web/admin/security/LoginController.java
@@ -86,25 +86,26 @@
modelAndView.setViewName("login");
return modelAndView;
}
-
- //谷歌验证码不正确则返回登录页面
-// Syspara para = sysparaService.find("open_google_auth_code");
-// if (null == para || "true".equals(para.getValue())) {
-// try {
-// googleAuthService.checkGoogleAuthCodeForLogin(this.getIp(), username, googleAuthCode, getRequest().getRequestURI());
-// } catch (BusinessException e) {
-// modelAndView.addObject("error", e.getMessage());
-// modelAndView.setViewName("login");
-// return modelAndView;
-// } catch (Throwable e) {
-// modelAndView.addObject("error", e.getMessage());
-// 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()) && user.isGoogle_auth_bind()) {
+ try {
+ googleAuthService.checkGoogleAuthCodeForLogin(this.getIp(), username, googleAuthCode, getRequest().getRequestURI());
+ } catch (BusinessException e) {
+ modelAndView.addObject("error", e.getMessage());
+ modelAndView.setViewName("login");
+ return modelAndView;
+ } catch (Throwable e) {
+ modelAndView.addObject("error", e.getMessage());
+ modelAndView.setViewName("login");
+ return modelAndView;
+ }
+ }
+
if (null==user) {
modelAndView.addObject("error", "未找到用户或用户无权限!");
modelAndView.setViewName("login");
@@ -113,7 +114,7 @@
//密码校验错误返回登录页面
String md5 = passwordEncoder.encodePassword(password, user.getUsername());
-
+ logger.info("----------密码："+md5);
if (!user.getPassword().equals(md5)) {
modelAndView.addObject("error", "登录密码错误!");
modelAndView.setViewName("login");
--
Gitblit v1.9.3