From fcabf7920a9306756464c5fcad4203643efd24c8 Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期一, 11 九月 2023 10:40:57 +0800
Subject: [PATCH] 退出接口

---
 src/main/java/com/qxueyou/scc/sys/action/LoginController.java |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
index be0ded6..ad3a838 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/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();
 	}
 
 	/**
@@ -419,6 +420,9 @@
 		}else if("portal".equals(logType)){
 			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 = ?";
+			params = CollectionUtils.newList(account);
 		}else{
             if(StringUtils.isEmpty(password)) {
 				return new Result(false, "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖");
@@ -434,6 +438,8 @@
 
         // 鏌ヨ鐢ㄦ埛淇℃伅
         User user = commonDAO.findUnique(hql,params, User.class);
+
+		System.out.println(user);
 
     	if(uuNumber!=null&&!"".equals(uuNumber)&&!"null".equals(uuNumber)){
     		//褰曟垚鍔熷瓨鍏ser閲岋紝鍒犻櫎session閲岀殑uuNumber锛屼笅涓汉鏃犳硶浣跨敤
@@ -456,7 +462,7 @@
 		//姣旇緝鐢ㄦ埛杈撳叆鐨勫瘑鐮佸姞瀵嗗悗鐨勫瓧绗︿覆鏄惁璺熸敞鍐屾椂濉啓鐨勫姞瀵嗗瘑鐮佺浉鍚�
 		if("study".equals(logType) || "portal".equals(logType) || "adminis".equals(logType)){
 			if (!newPassword.equals(user.getPassword())) {
-				return new Result(false, "鐢ㄦ埛璐︽埛銆佸瘑鐮侀敊璇垨缂哄皯鍑瘉");
+				return new Result(false, "瀵嗙爜閿欒");
 			}
 		}
 
@@ -491,7 +497,7 @@
 		// 瀛樺埌redis
 		redisTemplate.opsForValue().set(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper);
 		request.getSession().setAttribute(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper);
-		if ("study".equals(logType) || "portal".equals(logType)) {
+		if ("study".equals(logType) || "portal".equals(logType) || "zhyly".equals(logType)) {
 			/*if (StringUtils.isEmpty(ClientUtils.getClassId()) && user.getRoles() == null) {
 				return new Result(false, "璇ョ敤鎴锋湭鍔犲叆浠讳綍鐝骇鎴栨湭婵�娲伙紝璇疯仈绯荤彮涓讳换");
 			}*/
@@ -562,12 +568,12 @@
      * @param account 璐︽埛
      * @return
      */
-	@ApiOperation(value = "閫�鍑哄悗鍙扮郴缁熸搷浣�", notes = "")
-    @RequestMapping(value = "release", method = RequestMethod.GET)
-    public String release(HttpServletRequest httpRequest, HttpServletResponse response) {
-        doRelease(httpRequest, response);
-        return "redirect:/web/admin/index.html#login";
-    }
+//	@ApiOperation(value = "閫�鍑哄悗鍙扮郴缁熸搷浣�", notes = "")
+//    @RequestMapping(value = "out", method = RequestMethod.GET)
+//    public String release(HttpServletRequest httpRequest, HttpServletResponse response) {
+//        doRelease(httpRequest, response);
+//        return "閫�鍑烘垚鍔�";
+//    }
 
     /**
      * 鍚庡彴锛氶��鍑哄綍,鍚庡彴绯荤粺

--
Gitblit v1.8.0