From 7c1a152e3a978b14114f0d28275cbcc295357d51 Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Thu, 29 Aug 2024 15:52:38 +0800
Subject: [PATCH] 打开谷歌验证码

---
 src/main/java/project/web/admin/security/LoginController.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/project/web/admin/security/LoginController.java b/src/main/java/project/web/admin/security/LoginController.java
index 5431087..7178df3 100644
--- a/src/main/java/project/web/admin/security/LoginController.java
+++ b/src/main/java/project/web/admin/security/LoginController.java
@@ -88,20 +88,20 @@
 		}
 	    
 	    //谷歌验证码不正确则返回登录页面
-//	    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;
-//			}
-//		}
+	    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());

--
Gitblit v1.9.3