From 3f572e4e6114775c3c6918ba8380657c0ade91f4 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 21 Oct 2021 15:55:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/router/axios.js | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/router/axios.js b/src/router/axios.js
index 7b0a00d..15c6d44 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -8,33 +8,34 @@
import axios from 'axios';
import store from '@/store/';
import router from '@/router/router';
-import {serialize} from '@/util/util';
-import {getToken} from '@/util/auth';
-import {Message} from 'element-ui';
+import { serialize } from '@/util/util';
+import { getToken } from '@/util/auth';
+// import { Message } from 'element-ui';
+import { MessageBox } from 'element-ui';
import website from '@/config/website';
-import {Base64} from 'js-base64';
+import { Base64 } from 'js-base64';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
//默认超时时间
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 60000;
//返回其他状态码
-axios.defaults.validateStatus = function (status) {
- return status >= 200 && status <= 500;
+axios.defaults.validateStatus = function(status) {
+ return status >= 200 && status <= 500;
};
//跨域请求，允许保存cookie
axios.defaults.withCredentials = true;
// NProgress 配置
NProgress.configure({
- showSpinner: false
+ showSpinner: false
});
//http request拦截
axios.interceptors.request.use(config => {
- //开启 progress bar
- NProgress.start();
- const meta = (config.meta || {});
- const isToken = meta.isToken === false;
- config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
+ //开启 progress bar
+ NProgress.start();
+ const meta = (config.meta || {});
+ const isToken = meta.isToken === false;
+ config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`;
//让每个请求携带token
if (getToken() && !isToken) {
config.headers[website.tokenHeader] = 'bearer ' + getToken()
@@ -65,10 +66,12 @@
if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
// 如果请求为非200否者默认统一处理
if (status !== 200) {
- Message({
- message: message,
- type: 'error'
- });
+ // Message({
+ // message: message,
+ // type: 'error'
+ // });
+ MessageBox.alert(message);
+ // alert(message);
return Promise.reject(new Error(message))
}
return res;
@@ -77,4 +80,4 @@
return Promise.reject(new Error(error));
});
-export default axios;
+export default axios;
\ No newline at end of file
--
Gitblit v1.9.3