切换登录

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@5792 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/js/common/services.js

@@ -114,9 +114,21 @@ define(['angular', 'toaster'], function(angular) {
                 return login;
             },*/
             logout: function() {
-                var logout = $http.get(rootPath + "/logout");
-                logout.success(uncacheSession);
-                return logout;
+            	var config = {
+					cache: false,
+					headers: {
+        				'Cache-Control': 'no-cache',
+        				'Pragma': 'no-cache'
+					}
+				};
+				var logout = $http.get(rootPath + "/logout", config);
+				logout.success(uncacheSession);
+				logout.success(function(data){
+					if (data.content) {
+						window.location.href = data.content;
+					}
+				});
+				return logout;
             },
             redirectSignin: function() {
             	$http.get(rootPath + '/login/page').success(function(data) {

src/main/webapp/resources/js/index/app.js

@@ -523,9 +523,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			}
 	});
 		$scope.logout = function() {
-			AuthenticationService.logout().success(function() {
-				AuthenticationService.redirectSignin();
-			});
+			AuthenticationService.logout();
 		};
 		$scope.switchto = function(enUU) {// 切换企业
 			AuthenticationService.reSignin(enUU).success(function(){