From 84326b11401f217cd483d13bc72cec4ffd5da7ce Mon Sep 17 00:00:00 2001
From: bob <bob.zhang@highdatas.com>
Date: 星期三, 25 十一月 2020 10:02:22 +0800
Subject: [PATCH] 2020-11-13

---
 src/main.ts |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index a8dce39..8002fc4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,18 +10,20 @@
 //npm i moment --save
 import moment from 'moment';
 import echarts from 'echarts'
+import VueCookies from 'vue-cookies'
 
 
 Vue.prototype.$echarts = echarts
 Vue.use(ElementUI);
 Vue.prototype.$moment = moment;//璧嬪�间娇鐢�
- 
+Vue.use(VueCookies);
+
 Vue.config.productionTip = false;
 Vue.prototype.$axios = Axios;
 Axios.defaults.baseURL = '/api';
 Axios.defaults.headers.post['Content-Type'] = 'application/json';
 
-Axios.interceptors.request.use(
+/* Axios.interceptors.request.use(
     config => {
 		let userId_ = localStorage.getItem('userId');
         if (!userId_) {  //
@@ -34,7 +36,7 @@
     },
     err => {
         return Promise.reject(err);
-    });
+    }); */
 	
 
 new Vue({
@@ -43,3 +45,23 @@
   render: h => h(App)
 }).$mount("#app");
 
+
+Axios.interceptors.request.use(function (config) {
+ // let userId_ = localStorage.getItem('userId');
+ if(config.url == "/api/user/login") {
+	 
+ }
+ else {
+	//let userId_ = Vue.VueCookies.get('userId');//localStorage.getItem('userId'); 
+	let userId_ = Vue.$cookies.get('userId');//localStorage.getItem('userId'); 
+  if (!userId_ && config.url != "/api/user/login") {
+		router.replace('/login');
+	}
+  config.headers.common['userId'] = userId_;
+ }
+  return config;
+}, function (error) {
+ // console.info("error: ");
+ // console.info(error);
+  return Promise.reject(error);
+});
\ No newline at end of file

--
Gitblit v1.8.0