From 8b42573adbab654099ce7aae8186ee09c13c69ad Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Sat, 7 Mar 2026 10:15:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=A1=B9=E7=9B=AE=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E7=99=BB=E9=99=86=E6=97=B6=EF=BC=8C=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4token=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/router/index.js | 6 +++--- src/utils/httpRequest.js | 18 +++++++++--------- src/utils/index.js | 2 +- src/views/common/login.vue | 2 +- src/views/modules/common/excelUpload.vue | 2 +- src/views/modules/common/file-list-view.vue | 2 +- src/views/modules/common/file-list.vue | 2 +- src/views/modules/common/file-upload.vue | 2 +- src/views/modules/common/upload.vue | 2 +- src/views/modules/oss/oss-upload.vue | 2 +- src/views/modules/oss/oss.vue | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/App.vue b/src/App.vue index 3c82c5b..fde6ee9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -58,7 +58,7 @@ const pageActive = sessionStorage.getItem('page_active') // 如果100ms后仍然是false，说明是真正关闭，执行退出登录 - rqrq if (pageActive === 'false') { - const token = this.$cookie.get('token') + const token = this.$cookie.get('token_wms') if (token && token.trim()) { // 使用 sendBeacon 发送退出请求，可靠性高 - rqrq const url = this.$http.adornUrl('/sys/logout') diff --git a/src/router/index.js b/src/router/index.js index 9138767..3369e7e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,7 +52,7 @@ const mainRoutes = { { path: '/customer_report_show', component: _import('modules/report/customer_report_show'), name: 'report', meta: { title: '自定义报表展示' } },//2022-04-20 自定义报表路径 ], beforeEnter (to, from, next) { - let token = Vue.cookie.get('token') + let token = Vue.cookie.get('token_wms') if (!token || !/\S/.test(token)) { clearLoginInfo() next({ name: 'login' }) @@ -72,14 +72,14 @@ const router = new Router({ router.beforeEach((to, from, next) => { // 检查登录状态（除了登录页和404页） if (to.name !== 'login' && to.name !== '404' && !to.path.startsWith('/dashboard-')) { - let token = Vue.cookie.get('token') + let token = Vue.cookie.get('token_wms') if (!token || !/\S/.test(token)) { clearLoginInfo() next({ name: 'login' }) return } } - + // 添加动态(菜单)路由 // 1. 已经添加 or 全局路由, 直接访问 // 2. 获取菜单列表, 添加并保存本地存储 diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js index 9e85d7a..31fc4d1 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['token'] =Vue.cookie.get('token') // 请求头带上token + config.headers['token'] =Vue.cookie.get('token_wms') // 请求头带上token return config }, error => { return Promise.reject(error) @@ -44,7 +44,7 @@ http.interceptors.response.use(response => { router.push({ name: 'login' }) return Promise.reject(error) } - + // 检查响应体中的code字段 if (error.response.data && error.response.data.code === 401) { clearLoginInfo() @@ -55,7 +55,7 @@ http.interceptors.response.use(response => { // 请求已发出但没有收到响应（网络错误） console.error('网络请求失败:', error.message) } - + return Promise.reject(error) }) @@ -113,7 +113,7 @@ const instance = axios.create({ * 请求拦截 */ instance.interceptors.request.use(config => { - config.headers['token'] =Vue.cookie.get('token') // 请求头带上token + config.headers['token'] =Vue.cookie.get('token_wms') // 请求头带上token return config }, error => { return Promise.reject(error) @@ -138,7 +138,7 @@ instance.interceptors.response.use(response => { router.push({ name: 'login' }) return Promise.reject(error) } - + // 检查响应体中的code字段 if (error.response.data && error.response.data.code === 401) { clearLoginInfo() @@ -149,7 +149,7 @@ instance.interceptors.response.use(response => { // 请求已发出但没有收到响应（网络错误） console.error('网络请求失败:', error.message) } - + return Promise.reject(error) }) @@ -169,7 +169,7 @@ const instance2 = axios.create({ * 请求拦截 */ instance2.interceptors.request.use(config => { - config.headers['token'] = Vue.cookie.get('token') // 请求头带上token + config.headers['token'] = Vue.cookie.get('token_wms') // 请求头带上token return config }, error => { return Promise.reject(error) @@ -194,7 +194,7 @@ instance2.interceptors.response.use(response => { router.push({name: 'login'}) return Promise.reject(error) } - + // 检查响应体中的code字段（blob响应需要特殊处理） if (error.response.data) { // 尝试读取blob中的JSON数据 @@ -218,7 +218,7 @@ instance2.interceptors.response.use(response => { // 请求已发出但没有收到响应（网络错误） console.error('网络请求失败:', error.message) } - + return Promise.reject(error) }) diff --git a/src/utils/index.js b/src/utils/index.js index a0836ce..691fd9b 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('token') + Vue.cookie.delete('token_wms') store.commit('resetStore') router.options.isAddDynamicMenuRoutes = false } diff --git a/src/views/common/login.vue b/src/views/common/login.vue index aa97cad..8a6781e 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -147,7 +147,7 @@ }).then(({data}) => { if (data && data.code === 0) { // 设置Cookie过期时间为8小时，与后端token同步 - rqrq - this.$cookie.set('token', data.token, { expires: '8h' }) + this.$cookie.set('token_wms', data.token, { expires: '8h' }) this.$router.replace({ name: 'home' }) this.$i18n.locale=data.language localStorage.setItem('locale', data.language) diff --git a/src/views/modules/common/excelUpload.vue b/src/views/modules/common/excelUpload.vue index 4a0436c..40a48dd 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('token')}`) + this.url = this.$http.adornUrl(`/file/excel/upload?token=${this.$cookie.get('token_wms')}`) this.visible = true }, // 上传之前 diff --git a/src/views/modules/common/file-list-view.vue b/src/views/modules/common/file-list-view.vue index 58e9d8b..bf4fb90 100644 --- a/src/views/modules/common/file-list-view.vue +++ b/src/views/modules/common/file-list-view.vue @@ -134,7 +134,7 @@ export default { responseType: 'blob', headers: { 'Content-Type': 'application/json', - 'token': Vue.cookie.get('token') + 'token': Vue.cookie.get('token_wms') } }).then(({data}) => { // 不限制文件下载类型 diff --git a/src/views/modules/common/file-list.vue b/src/views/modules/common/file-list.vue index 3597f9f..a4247f4 100644 --- a/src/views/modules/common/file-list.vue +++ b/src/views/modules/common/file-list.vue @@ -150,7 +150,7 @@ export default { responseType: 'blob', headers: { 'Content-Type': 'application/json', - 'token': Vue.cookie.get('token') + 'token': Vue.cookie.get('token_wms') } }).then(({data}) => { // 不限制文件下载类型 diff --git a/src/views/modules/common/file-upload.vue b/src/views/modules/common/file-upload.vue index d913d43..63e5018 100644 --- a/src/views/modules/common/file-upload.vue +++ b/src/views/modules/common/file-upload.vue @@ -43,7 +43,7 @@ export default { }, methods: { init(val) { - this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token')}&folder=` + this.folder) + this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token_wms')}&folder=` + this.folder) this.visible = true this.fileMappingDto = val }, diff --git a/src/views/modules/common/upload.vue b/src/views/modules/common/upload.vue index 01350e5..3f3827a 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('token')}&folder=` + this.folder) + this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token_wms')}&folder=` + this.folder) this.visible = true }, // 上传之前 diff --git a/src/views/modules/oss/oss-upload.vue b/src/views/modules/oss/oss-upload.vue index 0a9004c..e719bf2 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('token')}&folder=`+this.folder) + this.url = this.$http.adornUrl(`/ftp/file/upload?token=${this.$cookie.get('token_wms')}&folder=`+this.folder) console.log(this.url) this.visible = true }, diff --git a/src/views/modules/oss/oss.vue b/src/views/modules/oss/oss.vue index 7782e3b..beac997 100644 --- a/src/views/modules/oss/oss.vue +++ b/src/views/modules/oss/oss.vue @@ -291,7 +291,7 @@ export default { responseType: 'blob', headers: { 'Content-Type': 'application/json', - 'token': Vue.cookie.get('token') + 'token': Vue.cookie.get('token_wms') } }).then(({data}) => { // 不限制文件下载类型