Browse Source

bug:登录 登出bug修改

wangdy 8 years ago
parent
commit
f1c2ccb2e9

+ 9 - 0
src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -205,6 +205,15 @@ public class SecurityController {
 		model.addAttribute("askUrl", config.getCrossAskOutUrl());
 		Object referer = request.getSession().getAttribute(SSOConfig.SSOReferer);
 		model.addAttribute("returnUrl", null == referer ? "/" : referer.toString());
+		// 未登录情况下,登录地址
+		Object logoutUrl = null;
+		boolean cross = SSOHelper.isCrossDomain(request);
+		if (cross) {
+			logoutUrl = SSOHelper.getRedirectRefererLogoutUrl(request);
+		} else {
+			logoutUrl = SSOHelper.getRedirectLogoutUrl(request, String.valueOf(request.getSession().getAttribute("SSOReferer")));
+		}
+		model.addAttribute("logoutUrl", logoutUrl);
 		return model;
 	}
 

+ 1 - 0
src/main/resources/dev/account.properties

@@ -8,6 +8,7 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.login.url=http://113.105.74.135:8001/sso/login
+sso.logout.url=http://113.105.74.135:8001/sso/logout
 sso.register.url=http://113.105.74.135:8001/sso/register
 
 #cross domain

+ 1 - 0
src/main/resources/prod/account.properties

@@ -8,6 +8,7 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.login.url=https://account.ubtob.com/sso/login
+sso.logout.url=https://account.ubtob.com/sso/logout
 sso.register.url=http://account.ubtob.com/sso/register
 
 #cross domain