diff --git a/.env.development b/.env.development index bedb972..6764d1f 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://pbl1.natapp1.cc/jeecg-boot +VUE_APP_API_BASE_URL=http://r4ba683f.natappfree.cc/jeecg-boot VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 5d46b5c..8659c10 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -62,6 +62,10 @@ const err = (error) => { } }) } + }) + store.dispatch('Logout').then(() => { + Vue.ls.remove(ACCESS_TOKEN) + window.location.reload() }) // update-end- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式,不直接跳转---- } @@ -157,6 +161,10 @@ function blobToJson(data) { }) } }) + store.dispatch('Logout').then(() => { + Vue.ls.remove(ACCESS_TOKEN) + window.location.reload() + }) } } } catch (err) { diff --git a/src/views/fileManage/modules/uploadModal.vue b/src/views/fileManage/modules/uploadModal.vue index 7f2351a..8fdfb38 100644 --- a/src/views/fileManage/modules/uploadModal.vue +++ b/src/views/fileManage/modules/uploadModal.vue @@ -16,7 +16,7 @@ :box-height="50" :max-file="999999" :can-download="false" - accept=".txt,.doc,.docx,.xls,.xlsx,.wps,.et,.csv,.xml,.json,.mp3,.mp4,.avi,.wmv,.jpg,.bmp,.png,.sql,.db,.dmp" + accept=".txt,.doc,.docx,.xls,.xlsx,.wps,.et,.csv,.xml,.json,.mp3,.mp4,.avi,.wmv,.jpg,.bmp,.png,.sql,.db,.dmp,.pdf" /> diff --git a/src/views/fileManage/recycling.vue b/src/views/fileManage/recycling.vue index 2a071f7..f91e7e1 100644 --- a/src/views/fileManage/recycling.vue +++ b/src/views/fileManage/recycling.vue @@ -182,11 +182,12 @@ deleteAllFile({}).then((res) => { if (res.success) { this.$message.success(res.result); - this.ipagination.total = 0; - this.ipagination.current = 1; } else { this.$message.warning(res.message); } + this.ipagination.total = 0; + this.ipagination.current = 1; + this.loadData(); }); this.$refs.modalForm.open(); },