Merge branch 'hotfix-20190306-suntg' into dev

src/main/java/com/uas/platform/b2b/controller/SecurityController.java

@@ -14,6 +14,7 @@ import com.uas.sso.AuthToken;
 import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.common.CookieHelper;
 import com.uas.sso.entity.UserAccount;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -171,7 +172,11 @@ 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 {

src/main/java/com/uas/platform/b2b/filter/B2bAbstractSSOInterceptor.java

@@ -26,6 +26,7 @@ public abstract class B2bAbstractSSOInterceptor extends HandlerInterceptorAdapte
     protected void sendRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
         boolean cross = SSOHelper.isCrossDomain(request);
         if (cross) {
+            logger.info("request.getRequestURL(): " + request.getRequestURL());
             request.getSession().setAttribute("SSOReferer", request.getRequestURL());
             response.sendRedirect(SSOHelper.getSSOService().getConfig().getCrossProxyUri());
         } else {