update

liwei0903nn · Aug 31, 2017 · a76fdf2 · a76fdf2
1 parent ff5eafe
commit a76fdf2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/imooc-security-browser/src/main/java/com/imooc/security/browser/BrowserSecurityConfig.java b/imooc-security-browser/src/main/java/com/imooc/security/browser/BrowserSecurityConfig.java
@@ -85,7 +85,9 @@ protected void configure(HttpSecurity http) throws Exception {
 					securityProperties.getBrowser().getLoginPage(),
 					SecurityConstants.DEFAULT_VALIDATE_CODE_URL_PREFIX+"/*",
 					securityProperties.getBrowser().getSignUpUrl(),
-					"/user/regist", "/session/invalid")
+					securityProperties.getBrowser().getSession().getSessionInvalidUrl()+".json",
+					securityProperties.getBrowser().getSession().getSessionInvalidUrl()+".html",
+					"/user/regist")
 					.permitAll()
 				.anyRequest()
 				.authenticated()

diff --git a/...-security-browser/src/main/java/com/imooc/security/browser/BrowserSecurityController.java b/...-security-browser/src/main/java/com/imooc/security/browser/BrowserSecurityController.java
@@ -87,7 +87,7 @@ public SocialUserInfo getSocialUserInfo(HttpServletRequest request) {
 		return userInfo;
 	}
 
-	@GetMapping(SecurityConstants.DEFAULT_SESSION_INVALID_URL)
+	@GetMapping(SecurityConstants.DEFAULT_SESSION_INVALID_URL+".json")
 	@ResponseStatus(code = HttpStatus.UNAUTHORIZED)
 	public SimpleResponse sessionInvalid(boolean concurrency) {
 		String message = "session失效";

diff --git a/...ity-browser/src/main/java/com/imooc/security/browser/session/AbstractSessionStrategy.java b/...ity-browser/src/main/java/com/imooc/security/browser/session/AbstractSessionStrategy.java
@@ -59,10 +59,12 @@ protected void onSessionInvalid(HttpServletRequest request, HttpServletResponse
 		}
 
 		String sourceUrl = request.getRequestURI();
-		String targetUrl = destinationUrl;
+		String targetUrl;
 
 		if (StringUtils.endsWithIgnoreCase(sourceUrl, ".html")) {
-			targetUrl = destinationUrl + ".html";
+			targetUrl = destinationUrl+".html";
+		}else{
+			targetUrl = destinationUrl+".json";
 		}
 
 		logger.info("session失效,跳转到" + targetUrl);

diff --git a/imooc-security-browser/src/main/resources/resources/session/invalid.html b/imooc-security-browser/src/main/resources/resources/session/invalid.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Session失效</title>
+</head>
+<body>
+	<h2>session失效页面</h2>
+</body>
+</html>
diff --git a/...security-core/src/main/java/com/imooc/security/core/social/ImoocConnectionStatusView.java b/...security-core/src/main/java/com/imooc/security/core/social/ImoocConnectionStatusView.java
@@ -31,6 +31,7 @@ public class ImoocConnectionStatusView extends AbstractView {
 	/* (non-Javadoc)
 	 * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request,
 			HttpServletResponse response) throws Exception {