From 0b47562cca7d60abb6bfea712c2bb1ad18f3edcb Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 12 Nov 2019 14:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue          |  7 +++-
 src/utils/request.js | 84 ++++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b01951992..b6693bd3f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,7 +7,7 @@
 
 <script>
 import { handleToken } from '@/utils/auth';
-import { creatSubscribe, perpetualTopic, commonTopic } from '@/utils/stomp';
+import { creatSubscribe, clearSubscribe, perpetualTopic, commonTopic } from '@/utils/stomp';
 import DeomonTopic from '@/views/demonstration/deomonTopic';
 import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 import Cookies from 'js-cookie';
@@ -53,6 +53,7 @@ export default {
     },
     methods: {
         async pageDestory() {
+            this.unSubscribe();
             const token = handleToken();
             Cookies.remove('UserDesignName');
             Cookies.remove('UserDesignToken');
@@ -77,6 +78,10 @@ export default {
                 }
             });
         },
+        unSubscribe() {
+            clearSubscribe(perpetualTopic);
+            clearSubscribe(commonTopic);
+        },
         subscribeMessage(res) {
             if (this.$refs.deomonTopic) {
                 this.$refs.deomonTopic.doShow(res);
diff --git a/src/utils/request.js b/src/utils/request.js
index ceea9f84b..853f203a8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,57 +9,57 @@ const BASE_API = getBaseUrl();
 
 // 创建axios实例
 const service = axios.create({
-	baseURL: BASE_API, // api的base_url
-	withCredentials: true, // 跨域请求时是否需要使用凭证
-	timeout: 60000 // 请求超时时间
+    baseURL: BASE_API, // api的base_url
+    withCredentials: true, // 跨域请求时是否需要使用凭证
+    timeout: 600000 // 请求超时时间
 });
 
 // request拦截器
 service.interceptors.request.use(config => {
-	if (handleToken()) {
-		config.headers['X-Token'] = handleToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
-	}
-	if (config.time) {
-		config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改
-	}
-	return config;
+    if (handleToken()) {
+        config.headers['X-Token'] = handleToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    if (config.time) {
+        config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    return config;
 }, error => {
-	// Do something with request error
-	Promise.reject(error);
+    // Do something with request error
+    Promise.reject(error);
 });
 
 // respone拦截器
 service.interceptors.response.use(
-	response => {
-		/** code为非200是抛错 可结合自己业务进行修改*/
-		const res = response.data;
-		if (res.code != 200) {
-			// 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
-			if (res.code == 40004 || res.code == 40005 || res.code == 40003) {
-				// eslint-disable-next-line no-undef
-				EventBus.$emit('stop');
-				// eslint-disable-next-line no-undef
-				EventBus.$emit('viewLoading', false);
-				// eslint-disable-next-line no-undef
-				EventBus.$emit('clearCheckLogin');
-				MessageBox.confirm('你已被登出，请重新登录', '确定登出', {
-					confirmButtonText: '重新登录',
-					showCancelButton: false,
-					type: 'warning'
-				}).then(() => {
-					store.dispatch('FedLogOut', gainClientId()).then(() => {
-						location.reload();// 为了重新实例化vue-router对象 避免bug
-					});
-				});
-			}
-			return Promise.reject(res);
-		} else {
-			return response.data;
-		}
-	},
-	error => {
-		return Promise.reject(error);
-	}
+    response => {
+        /** code为非200是抛错 可结合自己业务进行修改*/
+        const res = response.data;
+        if (res.code != 200) {
+            // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
+            if (res.code == 40004 || res.code == 40005 || res.code == 40003) {
+                // eslint-disable-next-line no-undef
+                EventBus.$emit('stop');
+                // eslint-disable-next-line no-undef
+                EventBus.$emit('viewLoading', false);
+                // eslint-disable-next-line no-undef
+                EventBus.$emit('clearCheckLogin');
+                MessageBox.confirm('你已被登出，请重新登录', '确定登出', {
+                    confirmButtonText: '重新登录',
+                    showCancelButton: false,
+                    type: 'warning'
+                }).then(() => {
+                    store.dispatch('FedLogOut', gainClientId()).then(() => {
+                        location.reload();// 为了重新实例化vue-router对象 避免bug
+                    });
+                });
+            }
+            return Promise.reject(res);
+        } else {
+            return response.data;
+        }
+    },
+    error => {
+        return Promise.reject(error);
+    }
 );
 
 export default service;