Browse Source

http请求拦截处理

yangc 7 years ago
parent
commit
8551323a35

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

@@ -16,6 +16,7 @@ define([ 'app/app' ], function(app) {
 			if(--i < 1) Loading.hide();
 		};
 
+		var url = arguments[0].url;
 		return {
 			request: function(cfg){
 				if(cfg.url) {
@@ -26,7 +27,10 @@ define([ 'app/app' ], function(app) {
 				return cfg;
 			},
 			requestError: function(rejection) {
-				endLoading();
+				if(url && url.indexOf('api/chat/message') < 0) {
+					endLoading();
+				}
+				// endLoading();
 				return $q.reject(rejection);
 			},
 			response: function(res) {
@@ -38,7 +42,10 @@ define([ 'app/app' ], function(app) {
 				return res;
 			},
 			responseError: function(rejection) {
-				endLoading();
+				if(url && url.indexOf('api/chat/message') < 0) {
+					endLoading();
+				}
+				// endLoading();
 				if(rejection.status == 401) {
 					window.location.href = rejection.data.loginUrl || 'index';
 				}

+ 1 - 26
src/main/webapp/resources/js/usercenter/app.js

@@ -28,32 +28,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 
 
 	// ui-router 路由配置
-	app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', function($stateProvider, $urlRouterProvider, $httpProvider){
-		$httpProvider.interceptors.push(['Loading', '$q', function(Loading, $q) {
-			var i = 0;
-			return {
-				request: function(cfg){
-					if(i == 0) Loading.show();
-					i ++;
-					return cfg;
-				},
-				requestError: function(rejection) {
-					i --;
-					if(i == 0) Loading.hide();
-					return $q.reject(rejection);
-				},
-				response: function(res) {
-					i --;
-					if(i == 0) Loading.hide();
-					return res;
-				},
-				responseError: function(rejection) {
-					i --;
-					if(i == 0) Loading.hide();
-					return $q.reject(rejection);
-				}
-			}
-		}]);
+	app.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider){
 		$urlRouterProvider.otherwise("/home");
 		$stateProvider.state('home', angularAMD.route({
 			url: '/home',

+ 1 - 27
src/main/webapp/resources/js/vendor/app.js

@@ -15,33 +15,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	};
 
 	// ui-router 路由配置
-	app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', function($stateProvider, $urlRouterProvider, $httpProvider){
-
-		$httpProvider.interceptors.push(['Loading', '$q', function(Loading, $q) {
-			var i = 0;
-			return {
-				request: function(cfg){
-					if(i == 0) Loading.show();
-					i ++;
-					return cfg;
-				},
-				requestError: function(rejection) {
-					i --;
-					if(i == 0) Loading.hide();
-					return $q.reject(rejection);
-				},
-				response: function(res) {
-					i --;
-					if(i == 0) Loading.hide();
-					return res;
-				},
-				responseError: function(rejection) {
-					i --;
-					if(i == 0) Loading.hide();
-					return $q.reject(rejection);
-				}
-			}
-		}]);
+	app.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider){
 
 		$urlRouterProvider.otherwise("/index");