소스 검색

fix: 退出时清空当前域的cookie

suntg 6 년 전
부모
커밋
12eb9ee308
1개의 변경된 파일7개의 추가작업 그리고 8개의 파일을 삭제
  1. 7 8
      src/main/java/com/uas/platform/b2b/controller/SecurityController.java

+ 7 - 8
src/main/java/com/uas/platform/b2b/controller/SecurityController.java

@@ -57,8 +57,11 @@ public class SecurityController {
 	public ModelMap logout(HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException {
 		response.setContentType("text/html;charset=UTF-8");
 		session.invalidate();
+		// 清除当前域的cookie
 		SSOHelper.clearLogin(request, response);
+		CookieHelper.clearCookieByName(response, "token");
 		SystemSession.clear();
+
 		String returnUrl = request.getHeader("Referer");
 		boolean cross = SSOHelper.isCrossDomain(request);
 		if (cross) {
@@ -71,7 +74,7 @@ public class SecurityController {
 
 	/**
 	 * 获取跳转登录的url
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @return
@@ -93,7 +96,7 @@ public class SecurityController {
 
 	/**
 	 * 获取跨域登录的参数
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @return
@@ -124,7 +127,7 @@ public class SecurityController {
 
 	/**
 	 * 跨域登录后
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 */
@@ -157,7 +160,7 @@ public class SecurityController {
 
 	/**
 	 * 获取跨域登录的参数
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @return
@@ -172,11 +175,7 @@ public class SecurityController {
 		model.addAttribute("returnUrl", String.valueOf(request.getSession().getAttribute(SSOConfig.SSOReferer)));
 		// 登录情况下,登出地址
 		Object logoutUrl = null;
-		SSOHelper.clearLogin(request, response);
-		// 清除当前域的cookie
-		CookieHelper.clearCookieByName(response, "token");
 		boolean cross = SSOHelper.isCrossDomain(request);
-
 		if (cross) {
 			logoutUrl = SSOHelper.getRedirectRefererLogoutUrl(request);
 		} else {