删除无效代码

im-ui/src/utils/httpRequest.js → im-ui/src/api/httpRequest.js

@@ -1,90 +1,90 @@
-import axios from 'axios'
+import axios from 'axios'
-import router from '@/router'
+import router from '@/router'
-import qs from 'qs'
+import qs from 'qs'
-import merge from 'lodash/merge'
+import merge from 'lodash/merge'
-import {
+import {
-	Message
+	Message
-} from 'element-ui'
+} from 'element-ui'
-
+
-const http = axios.create({
+const http = axios.create({
-	timeout: 1000 * 30,
+	timeout: 1000 * 30,
-	withCredentials: true,
+	withCredentials: true,
-	headers: {
+	headers: {
-		'Content-Type': 'application/json; charset=utf-8'
+		'Content-Type': 'application/json; charset=utf-8'
-	}
+	}
-})
+})
-
+
-/**
+/**
- * 请求拦截
+ * 请求拦截
- */
+ */
-http.interceptors.request.use(config => {
+http.interceptors.request.use(config => {
-	// todo 请求头带上token
+	// todo 请求头带上token
-	return config
+	return config
-}, error => {
+}, error => {
-	return Promise.reject(error)
+	return Promise.reject(error)
-})
+})
-
+
-/**
+/**
- * 响应拦截
+ * 响应拦截
- */
+ */
-http.interceptors.response.use(response => {
+http.interceptors.response.use(response => {
-	if (response.data.code == 200) {
+	if (response.data.code == 200) {
-		return response.data.data;
+		return response.data.data;
-	} else {
+	} else {
-		Message({
+		Message({
-			message: response.data.message,
+			message: response.data.message,
-			type: 'error',
+			type: 'error',
-			duration: 1500,
+			duration: 1500,
-			customClass: 'element-error-message-zindex'
+			customClass: 'element-error-message-zindex'
-		})
+		})
-		
+		
-		if (response.data.code == 401) {
+		if (response.data.code == 401) {
-			router.replace("/login");
+			router.replace("/login");
-		}
+		}
-		return Promise.reject(response.data)
+		return Promise.reject(response.data)
-	}
+	}
-}, error => {
+}, error => {
-	switch (error.response.status) {
+	switch (error.response.status) {
-		case 400:
+		case 400:
-			Message({
+			Message({
-				message: error.response.data,
+				message: error.response.data,
-				type: 'error',
+				type: 'error',
-				duration: 1500,
+				duration: 1500,
-				customClass: 'element-error-message-zindex'
+				customClass: 'element-error-message-zindex'
-			})
+			})
-			break
+			break
-		case 401:
+		case 401:
-			router.replace("/login");
+			router.replace("/login");
-			break
+			break
-		case 405:
+		case 405:
-			Message({
+			Message({
-				message: 'http请求方式有误',
+				message: 'http请求方式有误',
-				type: 'error',
+				type: 'error',
-				duration: 1500,
+				duration: 1500,
-				customClass: 'element-error-message-zindex'
+				customClass: 'element-error-message-zindex'
-			})
+			})
-			break
+			break
-		case 404:
+		case 404:
-		case 500:
+		case 500:
-			Message({
+			Message({
-				message: '服务器出了点小差，请稍后再试',
+				message: '服务器出了点小差，请稍后再试',
-				type: 'error',
+				type: 'error',
-				duration: 1500,
+				duration: 1500,
-				customClass: 'element-error-message-zindex'
+				customClass: 'element-error-message-zindex'
-			})
+			})
-			break
+			break
-		case 501:
+		case 501:
-			Message({
+			Message({
-				message: '服务器不支持当前请求所需要的某个功能',
+				message: '服务器不支持当前请求所需要的某个功能',
-				type: 'error',
+				type: 'error',
-				duration: 1500,
+				duration: 1500,
-				customClass: 'element-error-message-zindex'
+				customClass: 'element-error-message-zindex'
-			})
+			})
-			break
+			break
-	}
+	}
-
+
-	return Promise.reject(error)
+	return Promise.reject(error)
-})
+})
-
+
-
+
-export default http
+export default http

im-ui/src/common/globalApi.js

@@ -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
-}

im-ui/src/common/globalInfo.js

@@ -1,5 +0,0 @@
-const token = '';
-
-export default {
-  token
-}

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 httpRequest from './api/httpRequest';
-
-import globalApi from './common/globalApi';
-import globalInfo from './common/globalInfo';
 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',

im-ui/src/store/chatStore.js

@@ -1,4 +1,4 @@
-import httpRequest from '../utils/httpRequest.js'
+import httpRequest from '../api/httpRequest.js'
 
 
 export default {

im-ui/src/store/friendsStore.js

@@ -1,4 +1,4 @@
-import httpRequest from '../utils/httpRequest.js'
+import httpRequest from '../api/httpRequest.js'
 
 export default {