Browse Source

取消代理界面,改用通知方式登录退出

wangdy 8 years ago
parent
commit
c4ea595b2a

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

@@ -68,12 +68,12 @@ public class SecurityController {
 		if (StringUtils.isEmpty(returnUrl)) {
 			returnUrl = request.getHeader("Referer");
 		}
-		boolean cross = SSOHelper.isCrossDomain(request);
+		/*boolean cross = SSOHelper.isCrossDomain(request);
 		if (cross) {
 			request.getSession().setAttribute(SSOConfig.SSOReferer, returnUrl);
 			// 跨域情况,需要再次询问账户中心
 			returnUrl = request.getContextPath() + "/logout/proxy";
-		}
+		}*/
 		return new ModelMap("content", returnUrl);
 	}
 
@@ -96,11 +96,11 @@ public class SecurityController {
 		} else {
 			redirectUrl = SSOHelper.getRedirectLoginUrl(request, returnUrl);
 		}
-		boolean cross = SSOHelper.isCrossDomain(request);
+		/*boolean cross = SSOHelper.isCrossDomain(request);
 		if (cross) {
 			// 跨域代理界面
 			redirectUrl = request.getContextPath() + "/login/proxy";
-		}
+		}*/
 		return new ModelMap("content", redirectUrl);
 	}
 	/**

+ 3 - 2
src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -78,9 +78,10 @@ define([ 'app/app' ], function(app) {
 
 			// 退出
 			$scope.logout = function() {
-				AuthenticationService.logout().success(function() {
+				/*AuthenticationService.logout().success(function() {
 					SessionService.removeCookie($rootScope.userInfo.userUU);
-				});
+				});*/
+                AuthenticationService.logoutWithoutProxy();
 			};
 
 			// 企业换企业开关

+ 6 - 0
src/main/webapp/resources/js/common/services.js

@@ -161,6 +161,12 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 				login.success(cacheSession);
 				return login;
 			},*/
+			logoutWithoutProxy : function(){
+                var logout = $http.get(rootPath+'/logout/crossBefore');
+                logout.success(function(data){
+                    window.location.href =  data.logoutUrl;
+                });
+			},
 			logout : function() {
 				var config = {
 					cache: false,