Merge remote-tracking branch 'origin/master'

胡仁荣

2023-09-11 937daff0ebc1aa16a852d5a86434ab1994d8a02d

 src/main/java/com/qxueyou/scc/sys/action/LoginController.java

@@ -328,15 +328,16 @@
   }

   //退出录 清除session
   @RequestMapping(value = "khdloginout", method = RequestMethod.POST)
   @RequestMapping(value = "release", method = RequestMethod.GET)
   @ResponseBody
   public void khdloginout(HttpServletRequest request, HttpServletResponse response) {
      System.out.println("清除session");
      HttpSession session = request.getSession();
      redisTemplate.delete(UserInfoWrapper.SESSION_USER_INFO_KEY);
      System.out.println(session.getAttribute("userId"));
      System.out.println(session.getAttribute("classId"));
      session.invalidate();
   public void release(HttpServletRequest request, HttpServletResponse response) {
//      System.out.println("清除session");
//      HttpSession session = request.getSession();
//      redisTemplate.delete(UserInfoWrapper.SESSION_USER_INFO_KEY);
//      System.out.println(session.getAttribute("userId"));
//      System.out.println(session.getAttribute("classId"));
      doRelease(request, response);
//      session.invalidate();
   }

   /**
@@ -420,7 +421,7 @@
         hql = "from User where deleteFlag is false and email = ?";
         params = CollectionUtils.newList(account);
      }else if("zhyly".equals(logType)){
         hql = "from User where deleteFlag is false and mobilePhone = ? and creator != '管理员'";
         hql = "from User where deleteFlag is false and mobilePhone = ?";
         params = CollectionUtils.newList(account);
      }else{
            if(StringUtils.isEmpty(password)) {