diff --git a/src/mock/modules/common.js b/src/mock/modules/common.js index a748e95..b459b62 100644 --- a/src/mock/modules/common.js +++ b/src/mock/modules/common.js @@ -10,7 +10,7 @@ export function login () { 'msg': 'success', 'code': 0, 'expire': Mock.Random.natural(60 * 60 * 1, 60 * 60 * 12), - 'rx-token': Mock.Random.string('abcdefghijklmnopqrstuvwxyz0123456789', 32) + 'token': Mock.Random.string('abcdefghijklmnopqrstuvwxyz0123456789', 32) } } } diff --git a/src/router/index.js b/src/router/index.js index 12a32b1..daecaf0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -40,7 +40,7 @@ const mainRoutes = { // { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } } ], beforeEnter (to, from, next) { - let token = Vue.cookie.get('rx-token') + let token =Vue.cookie.get('token') if (!token || !/\S/.test(token)) { clearLoginInfo() next({ name: 'login' }) diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js index 83a99ac..a1a5d90 100644 --- a/src/utils/httpRequest.js +++ b/src/utils/httpRequest.js @@ -19,7 +19,7 @@ const http = axios.create({ * 请求拦截 */ http.interceptors.request.use(config => { - config.headers['rx-token'] = Vue.cookie.get('rx-token') // 请求头带上token + config.headers['token'] =Vue.cookie.get('token') // 请求头带上token return config }, error => { return Promise.reject(error) @@ -92,7 +92,7 @@ const instance = axios.create({ * 请求拦截 */ instance.interceptors.request.use(config => { - config.headers['rx-token'] = Vue.cookie.get('rx-token') // 请求头带上token + config.headers['token'] =Vue.cookie.get('token') // 请求头带上token return config }, error => { return Promise.reject(error) diff --git a/src/utils/index.js b/src/utils/index.js index 3c56b79..a0836ce 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -52,7 +52,7 @@ export function treeDataTranslate (data, id = 'id', pid = 'parentId') { * 清除登录信息 */ export function clearLoginInfo () { - Vue.cookie.delete('rx-token') + Vue.cookie.delete('token') store.commit('resetStore') router.options.isAddDynamicMenuRoutes = false } diff --git a/src/views/common/home.vue b/src/views/common/home.vue index 73451d6..5411a02 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -13,7 +13,7 @@ languageRefresh(){ let bool = localStorage.getItem('refresh') if (bool == '0'){ - this.$router.go(0); + // this.$router.go(0); localStorage.setItem('refresh','1') } } diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 6d7fe13..d87b0a0 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -67,7 +67,7 @@ }) }).then(({data}) => { if (data && data.code === 0) { - this.$cookie.set('rx-token', data.token) + this.$cookie.set('token', data.token) this.$router.replace({ name: 'home' }) localStorage.setItem('locale', data.language) localStorage.setItem('refresh', "0") diff --git a/src/views/modules/common/excelUpload.vue b/src/views/modules/common/excelUpload.vue index 5e13b5a..d60c703 100644 --- a/src/views/modules/common/excelUpload.vue +++ b/src/views/modules/common/excelUpload.vue @@ -26,7 +26,7 @@ }, methods: { init (id) { - this.url = this.$http.adornUrl(`/file/excel/upload?token=${this.$cookie.get('rx-token')}`) + this.url = this.$http.adornUrl(`/file/excel/upload?token=${this.$cookie.get('token')}`) this.visible = true }, // 上传之前 diff --git a/src/views/modules/common/upload.vue b/src/views/modules/common/upload.vue index 3277d7e..5f8473b 100644 --- a/src/views/modules/common/upload.vue +++ b/src/views/modules/common/upload.vue @@ -27,7 +27,7 @@ }, methods: { init(id) { - this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('rx-token')}&folder=` + this.folder) + this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}&folder=` + this.folder) console.log(this.url) this.visible = true }, diff --git a/src/views/modules/oss/oss-upload.vue b/src/views/modules/oss/oss-upload.vue index e96a1f3..0a9004c 100644 --- a/src/views/modules/oss/oss-upload.vue +++ b/src/views/modules/oss/oss-upload.vue @@ -33,7 +33,7 @@ }, methods: { init (id) { - this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('rx-token')}&folder=`+this.folder) + this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}&folder=`+this.folder) console.log(this.url) this.visible = true }, diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue index a4781d3..5b66827 100644 --- a/src/views/modules/purchaseorder/purchaseRequisition.vue +++ b/src/views/modules/purchaseorder/purchaseRequisition.vue @@ -1023,7 +1023,7 @@ export default { responseType: 'blob', headers: { 'Content-Type': 'application/json', - 'rx-token': Vue.cookie.get('rx-token') + 'token':Vue.cookie.get('token') } }).then(({data}) => { // 不限制文件下载类型