peternameyakj
2024-08-29 7c1a152e3a978b14114f0d28275cbcc295357d51
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());