Commit 8a15f1da authored by 冷冷's avatar 冷冷

优化返回码

parent 9f0d1778
...@@ -17,7 +17,6 @@ export default { ...@@ -17,7 +17,6 @@ export default {
] ]
}, },
// http的status默认放行不才用统一处理的, // http的status默认放行不才用统一处理的,
statusWhiteList: [400, 500, 401],
// 配置首页不可关闭 // 配置首页不可关闭
isFirstPage: false, isFirstPage: false,
fistPage: { fistPage: {
......
...@@ -5,15 +5,14 @@ ...@@ -5,15 +5,14 @@
* serialize是否开启form表单提交 * serialize是否开启form表单提交
* isToken是否需要token * isToken是否需要token
*/ */
import axios from 'axios' import {serialize} from '@/util/util'
import { serialize } from '@/util/util'
import website from '@/const/website' import website from '@/const/website'
import store from '../store' import store from '../store'
import { getStore } from '../util/store' import {getStore} from '../util/store'
import { getToken } from '@/util/auth' import {getToken} from '@/util/auth'
import NProgress from 'nprogress' // progress bar import NProgress from 'nprogress' // progress bar
import errorCode from '@/const/errorCode' import errorCode from '@/const/errorCode'
import { Message } from 'element-ui' import {Message} from 'element-ui'
import 'nprogress/nprogress.css' // progress bar style import 'nprogress/nprogress.css' // progress bar style
axios.defaults.timeout = 30000 axios.defaults.timeout = 30000
// 返回其他状态吗 // 返回其他状态吗
...@@ -33,7 +32,7 @@ axios.interceptors.request.use(config => { ...@@ -33,7 +32,7 @@ axios.interceptors.request.use(config => {
if (store.getters.access_token && !isToken) { if (store.getters.access_token && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带token--['X-Token']为自定义key 请根据实际情况自行修改 config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带token--['X-Token']为自定义key 请根据实际情况自行修改
} }
const TENANT_ID = getStore({ name: 'tenantId' }) const TENANT_ID = getStore({name: 'tenantId'})
if (TENANT_ID) { if (TENANT_ID) {
config.headers['TENANT_ID'] = TENANT_ID // 租户ID config.headers['TENANT_ID'] = TENANT_ID // 租户ID
} }
...@@ -50,16 +49,22 @@ axios.interceptors.request.use(config => { ...@@ -50,16 +49,22 @@ axios.interceptors.request.use(config => {
axios.interceptors.response.use(res => { axios.interceptors.response.use(res => {
NProgress.done() NProgress.done()
const status = Number(res.status) || 200 const status = Number(res.status) || 200
const statusWhiteList = website.statusWhiteList || [] const message = res.data.msg || errorCode[status] || errorCode['default']
const message = res.data.message || errorCode[status] || errorCode['default'] if (res.data.code === 1) {
if (status !== 200 & !statusWhiteList.includes(status)) {
Message({ Message({
message: message, message: message,
type: 'error' type: 'error'
}) })
return Promise.reject(new Error(message)) return Promise.reject(new Error(message))
} }
if (status !== 200) return Promise.reject(res) if (status !== 200) {
Message({
message: message,
type: 'error'
})
return Promise.reject(new Error(message))
}
return res return res
}, error => { }, error => {
NProgress.done() NProgress.done()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment