From 9102aa7e0b42ce5b9667fa3b67fede889df60fc0 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 02 May 2025 20:08:00 +0800
Subject: [PATCH] /

---
 src/main/java/project/web/admin/security/LoginController.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 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..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());
@@ -113,7 +113,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