From e41dd8a0f1d4fd310b4e57094bed2bd85b3a22a6 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Fri, 19 Nov 2021 14:53:16 +0800
Subject: [PATCH] !370 fix 修复关闭 xss 功能导致可重复读 RepeatableFilter 失效 Merge pull request !370 from 疯狂的狮子Li/master
---
ruoyi-ui/src/plugins/download.js | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index cb10ab0..e1c6640 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -1,6 +1,8 @@
-import { saveAs } from 'file-saver'
import axios from 'axios'
+import { Message } from 'element-ui'
+import { saveAs } from 'file-saver'
import { getToken } from '@/utils/auth'
+import { blobValidate } from "@/utils/ruoyi";
const baseURL = process.env.VUE_APP_BASE_API
@@ -12,9 +14,14 @@
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(res => {
- const blob = new Blob([res.data])
- this.saveAs(blob, decodeURI(res.headers['download-filename']))
+ }).then(async (res) => {
+ const isLogin = await this.blobValidate(res.data);
+ if (isLogin) {
+ const blob = new Blob([res.data])
+ this.saveAs(blob, decodeURI(res.headers['download-filename']))
+ } else {
+ Message.error('无效的会话，或者会话已过期，请重新登录。');
+ }
})
},
resource(resource) {
@@ -24,9 +31,14 @@
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(res => {
- const blob = new Blob([res.data])
- this.saveAs(blob, decodeURI(res.headers['download-filename']))
+ }).then(async (res) => {
+ const isLogin = await this.blobValidate(res.data);
+ if (isLogin) {
+ const blob = new Blob([res.data])
+ this.saveAs(blob, decodeURI(res.headers['download-filename']))
+ } else {
+ Message.error('无效的会话，或者会话已过期，请重新登录。');
+ }
})
},
zip(url, name) {
@@ -36,9 +48,14 @@
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(res => {
- const blob = new Blob([res.data], { type: 'application/zip' })
- this.saveAs(blob, name)
+ }).then(async (res) => {
+ const isLogin = await blobValidate(res.data);
+ if (isLogin) {
+ const blob = new Blob([res.data], { type: 'application/zip' })
+ this.saveAs(blob, name)
+ } else {
+ Message.error('无效的会话，或者会话已过期，请重新登录。');
+ }
})
},
saveAs(text, name, opts) {
--
Gitblit v1.9.2