Browse Source

解析blob响应是否登录失效

tags/v3.3.0
RuoYi 3 years ago
parent
commit
3901695a6f
  1. 15
      ruoyi-ui/src/plugins/download.js
  2. 18
      ruoyi-ui/src/utils/request.js
  3. 11
      ruoyi-ui/src/utils/ruoyi.js

15
ruoyi-ui/src/plugins/download.js

@ -1,6 +1,8 @@ @@ -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 @@ export default { @@ -12,9 +14,14 @@ export default {
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) {

18
ruoyi-ui/src/utils/request.js

@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui' @@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { tansParams } from "@/utils/ruoyi";
import { tansParams, blobValidate } from "@/utils/ruoyi";
import { saveAs } from 'file-saver'
let downloadLoadingInstance;
@ -43,6 +43,10 @@ service.interceptors.response.use(res => { @@ -43,6 +43,10 @@ service.interceptors.response.use(res => {
const code = res.data.code || 200;
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default']
// 二进制数据则直接返回
if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){
return res.data
}
if (code === 401) {
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
confirmButtonText: '重新登录',
@ -98,10 +102,14 @@ export function download(url, params, filename) { @@ -98,10 +102,14 @@ export function download(url, params, filename) {
transformRequest: [(params) => { return tansParams(params) }],
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
responseType: 'blob'
}).then((data) => {
const content = data
const blob = new Blob([content])
saveAs(blob, filename)
}).then(async (data) => {
const isLogin = await blobValidate(data);
if (isLogin) {
const blob = new Blob([data])
saveAs(blob, filename)
} else {
Message.error('无效的会话,或者会话已过期,请重新登录。');
}
downloadLoadingInstance.close();
}).catch((r) => {
console.error(r)

11
ruoyi-ui/src/utils/ruoyi.js

@ -214,3 +214,14 @@ export function tansParams(params) { @@ -214,3 +214,14 @@ export function tansParams(params) {
}
return result
}
// 验证是否为blob格式
export async function blobValidate(data) {
try {
const text = await data.text();
JSON.parse(text);
return false;
} catch (error) {
return true;
}
}

Loading…
Cancel
Save