Browse Source

Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

suntg 8 years ago
parent
commit
06294ff287

+ 1 - 1
src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -258,7 +258,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 		boolean cross = SSOHelper.isCrossDomain(request);
 		if (cross) {
 			request.getSession().setAttribute("SSOReferer", request.getRequestURL());
-			response.sendRedirect(SSOHelper.getRedirectLoginUrl(request));
+			response.sendRedirect(SSOHelper.getRedirectLoginUrl(request,request.getHeader("Referer")));
 		} else {
 			SSOHelper.clearRedirectLogin(request, response);
 		}

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

@@ -4,6 +4,7 @@ account.user.save.url=https://account.ubtob.com/api/user
 
 ### sso config
 sso.app=mall
+sso.cookie.domain=usoftmall.com
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false