diff --git a/im-ui/src/utils/httpRequest.js b/im-ui/src/api/httpRequest.js similarity index 95% rename from im-ui/src/utils/httpRequest.js rename to im-ui/src/api/httpRequest.js index b03e4fa..9bd20f2 100644 --- a/im-ui/src/utils/httpRequest.js +++ b/im-ui/src/api/httpRequest.js @@ -1,90 +1,90 @@ -import axios from 'axios' -import router from '@/router' -import qs from 'qs' -import merge from 'lodash/merge' -import { - Message -} from 'element-ui' - -const http = axios.create({ - timeout: 1000 * 30, - withCredentials: true, - headers: { - 'Content-Type': 'application/json; charset=utf-8' - } -}) - -/** - * 请求拦截 - */ -http.interceptors.request.use(config => { - // todo 请求头带上token - return config -}, error => { - return Promise.reject(error) -}) - -/** - * 响应拦截 - */ -http.interceptors.response.use(response => { - if (response.data.code == 200) { - return response.data.data; - } else { - Message({ - message: response.data.message, - type: 'error', - duration: 1500, - customClass: 'element-error-message-zindex' - }) - - if (response.data.code == 401) { - router.replace("/login"); - } - return Promise.reject(response.data) - } -}, error => { - switch (error.response.status) { - case 400: - Message({ - message: error.response.data, - type: 'error', - duration: 1500, - customClass: 'element-error-message-zindex' - }) - break - case 401: - router.replace("/login"); - break - case 405: - Message({ - message: 'http请求方式有误', - type: 'error', - duration: 1500, - customClass: 'element-error-message-zindex' - }) - break - case 404: - case 500: - Message({ - message: '服务器出了点小差,请稍后再试', - type: 'error', - duration: 1500, - customClass: 'element-error-message-zindex' - }) - break - case 501: - Message({ - message: '服务器不支持当前请求所需要的某个功能', - type: 'error', - duration: 1500, - customClass: 'element-error-message-zindex' - }) - break - } - - return Promise.reject(error) -}) - - -export default http +import axios from 'axios' +import router from '@/router' +import qs from 'qs' +import merge from 'lodash/merge' +import { + Message +} from 'element-ui' + +const http = axios.create({ + timeout: 1000 * 30, + withCredentials: true, + headers: { + 'Content-Type': 'application/json; charset=utf-8' + } +}) + +/** + * 请求拦截 + */ +http.interceptors.request.use(config => { + // todo 请求头带上token + return config +}, error => { + return Promise.reject(error) +}) + +/** + * 响应拦截 + */ +http.interceptors.response.use(response => { + if (response.data.code == 200) { + return response.data.data; + } else { + Message({ + message: response.data.message, + type: 'error', + duration: 1500, + customClass: 'element-error-message-zindex' + }) + + if (response.data.code == 401) { + router.replace("/login"); + } + return Promise.reject(response.data) + } +}, error => { + switch (error.response.status) { + case 400: + Message({ + message: error.response.data, + type: 'error', + duration: 1500, + customClass: 'element-error-message-zindex' + }) + break + case 401: + router.replace("/login"); + break + case 405: + Message({ + message: 'http请求方式有误', + type: 'error', + duration: 1500, + customClass: 'element-error-message-zindex' + }) + break + case 404: + case 500: + Message({ + message: '服务器出了点小差,请稍后再试', + type: 'error', + duration: 1500, + customClass: 'element-error-message-zindex' + }) + break + case 501: + Message({ + message: '服务器不支持当前请求所需要的某个功能', + type: 'error', + duration: 1500, + customClass: 'element-error-message-zindex' + }) + break + } + + return Promise.reject(error) +}) + + +export default http diff --git a/im-ui/src/common/globalApi.js b/im-ui/src/common/globalApi.js deleted file mode 100644 index 85dfa93..0000000 --- a/im-ui/src/common/globalApi.js +++ /dev/null @@ -1,15 +0,0 @@ -import globalVariable from './globalInfo'; - -function appendToken(url){ - console.log(url); - if(url.indexOf('?')==-1){ - url+="?" - } - url += `access_token=${globalVariable.token}`; - return url; -} - - -export default{ - appendToken -} \ No newline at end of file diff --git a/im-ui/src/common/globalInfo.js b/im-ui/src/common/globalInfo.js deleted file mode 100644 index 2c62493..0000000 --- a/im-ui/src/common/globalInfo.js +++ /dev/null @@ -1,5 +0,0 @@ -const token = ''; - -export default { - token -} diff --git a/im-ui/src/main.js b/im-ui/src/main.js index 8a9008f..da9bb33 100644 --- a/im-ui/src/main.js +++ b/im-ui/src/main.js @@ -1,28 +1,23 @@ import Vue from 'vue' import App from './App' -import router from './router' // 自动扫描index.js +import router from './router' import axios from 'axios' import VueAxios from 'vue-axios' import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; -import httpRequest from './utils/httpRequest'; - -import globalApi from './common/globalApi'; -import globalInfo from './common/globalInfo'; +import httpRequest from './api/httpRequest'; import * as socketApi from './api/wssocket' ; import store from './store'; -console.log(store); + Vue.use(ElementUI); // 挂载全局 - Vue.prototype.$wsApi = socketApi; Vue.prototype.$http = httpRequest // http请求方法 -Vue.prototype.globalApi = globalApi; // 注册全局方法 -Vue.prototype.globalInfo = globalInfo; // 注册全局变量 -Vue.config.productionTip = false + +Vue.config.productionTip = false; new Vue({ el: '#app', diff --git a/im-ui/src/store/chatStore.js b/im-ui/src/store/chatStore.js index 62852e9..d0076b4 100644 --- a/im-ui/src/store/chatStore.js +++ b/im-ui/src/store/chatStore.js @@ -1,4 +1,4 @@ -import httpRequest from '../utils/httpRequest.js' +import httpRequest from '../api/httpRequest.js' export default { diff --git a/im-ui/src/store/friendsStore.js b/im-ui/src/store/friendsStore.js index f06fe70..ee8a2c6 100644 --- a/im-ui/src/store/friendsStore.js +++ b/im-ui/src/store/friendsStore.js @@ -1,4 +1,4 @@ -import httpRequest from '../utils/httpRequest.js' +import httpRequest from '../api/httpRequest.js' export default {