|
@@ -1,5 +1,5 @@
|
|
|
import axios from 'axios'
|
|
import axios from 'axios'
|
|
|
-import { MessageBox, Message, Loading } from 'element-ui'
|
|
|
|
|
|
|
+import { MessageBox, Message } from 'element-ui'
|
|
|
import store from '@/store'
|
|
import store from '@/store'
|
|
|
import { getToken } from '@/utils/auth'
|
|
import { getToken } from '@/utils/auth'
|
|
|
import { appID, appKey, appSecret, serverUrl, devServerUrl } from '@/settings'
|
|
import { appID, appKey, appSecret, serverUrl, devServerUrl } from '@/settings'
|
|
@@ -11,7 +11,7 @@ const service = axios.create({
|
|
|
timeout: 1000 * 60 * 3 // request timeout
|
|
timeout: 1000 * 60 * 3 // request timeout
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
-let loadingInstance = null
|
|
|
|
|
|
|
+// let loadingInstance = null
|
|
|
|
|
|
|
|
// request interceptor
|
|
// request interceptor
|
|
|
service.interceptors.request.use(
|
|
service.interceptors.request.use(
|
|
@@ -20,7 +20,7 @@ service.interceptors.request.use(
|
|
|
config.headers['AppID'] = appID
|
|
config.headers['AppID'] = appID
|
|
|
config.headers['AppKey'] = appKey
|
|
config.headers['AppKey'] = appKey
|
|
|
config.headers['AppSecret'] = appSecret
|
|
config.headers['AppSecret'] = appSecret
|
|
|
- loadingInstance = Loading.service({ fullscreen: true })
|
|
|
|
|
|
|
+ // loadingInstance = Loading.service({ fullscreen: true })
|
|
|
if (store.getters.token) {
|
|
if (store.getters.token) {
|
|
|
config.headers['Authorization'] = 'Bearer ' + getToken()
|
|
config.headers['Authorization'] = 'Bearer ' + getToken()
|
|
|
}
|
|
}
|
|
@@ -36,9 +36,9 @@ service.interceptors.request.use(
|
|
|
// response interceptor
|
|
// response interceptor
|
|
|
service.interceptors.response.use(
|
|
service.interceptors.response.use(
|
|
|
response => {
|
|
response => {
|
|
|
- loadingInstance.close()
|
|
|
|
|
|
|
+ // loadingInstance.close()
|
|
|
const res = response.data
|
|
const res = response.data
|
|
|
- if (res.code !== 200) {
|
|
|
|
|
|
|
+ if (res.code !== 0) {
|
|
|
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
|
|
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
|
|
|
if (res.code === 401) {
|
|
if (res.code === 401) {
|
|
|
// to re-login
|
|
// to re-login
|
|
@@ -64,7 +64,7 @@ service.interceptors.response.use(
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
error => {
|
|
error => {
|
|
|
- loadingInstance.close()
|
|
|
|
|
|
|
+ // loadingInstance.close()
|
|
|
Message({
|
|
Message({
|
|
|
message: error.message || 'Error',
|
|
message: error.message || 'Error',
|
|
|
type: 'error',
|
|
type: 'error',
|