axios超时处理

Former-commit-id: fc2c59474e653df386e29cb95999d6cab078b5e3
Former-commit-id: 5820a28eb0f5250159e28df8582d294732c49776

projects/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.729d3")]
+[assembly: AssemblyInformationalVersion("1.0.0.729d4")]

projects/WebMVC/wwwroot/js/axios.js

@@ -1,4 +1,5 @@
-axios.interceptors.request.use(
+axios.defaults.timeout = 1000*10;
+axios.interceptors.request.use(
     function (config) {
         if (config.url.indexOf('.html') === -1 && config.url.indexOf('getToken') === -1) {
             if (store.state.token.accessToken) {
@@ -11,9 +12,8 @@
         return config;
     },
     function (error) {
-        console.error('axios.interceptors.request.error:');
-        console.error(error);
         loading.hide();
+        console.error(error);
         return Promise.reject(error);
     }
 );
@@ -21,27 +21,34 @@ axios.interceptors.response.use(function (response) {
     loading.hide();
     return response;
 }, function (error) {
+        loading.hide();
         console.error(error);
-    if (error.response.status === 401 && error.config.url.indexOf('refreshToken') === -1) {
+        if (error.response) {
-        var url = apiHost + '/UserCenter/api/v1/token/refreshToken';
+            if (error.response.status === 401 && error.config.url.indexOf('refreshToken') === -1) {
-        var data = '"' + store.state.token.refreshToken + '"';
+                var url = apiHost + '/UserCenter/api/v1/token/refreshToken';
-        return axios.post(url, data, { headers: { 'Content-Type': 'application/json;charset=UTF-8' } })
+                var data = '"' + store.state.token.refreshToken + '"';
-            .then(function (response) {
+                return axios.post(url, data, { headers: { 'Content-Type': 'application/json;charset=UTF-8' } })
-                store.commit('setToken', response.data);
+                    .then(function (response) {
-                error.config.headers['Authorization'] = 'Bearer ' + store.state.accessToken;
+                        store.commit('setToken', response.data);
-                console.log('redo request after refresh token');
+                        error.config.headers['Authorization'] = 'Bearer ' + store.state.accessToken;
-                return axios(error.config);
+                        console.log('redo request after refresh token');
-            })
+                        return axios(error.config);
-            .catch(function (error) {
+                    })
-                if (error.response.status === 401) {
+                    .catch(function (error) {
-                    console.log('refreshToken 已过期');
+                        if (error.response.status === 401) {
-                    router.push('/routes/login.html');
+                            console.log('refreshToken 已过期');
-                }
+                            router.push('/routes/login.html');
-                else {
+                        }
-                    console.error(error);
+                        else {
-                }
+                            console.error(error);
-            });
+                        }
-    }
+                    });
-    loading.hide();
+            }
-    return Promise.reject(error);
+        }
+        else {
+            if (error.message.indexOf('timeout') !== -1) {
+                Swal.fire('请求超时，请返回重试');
+            }
+        }
+        return Promise.reject(error);
 });