优化下载解析blob异常提示

master
RuoYi 3 years ago
parent 0c103e53b9
commit 674a483ae7
  1. 17
      src/plugins/download.js
  2. 5
      src/utils/request.js

@ -2,6 +2,7 @@ import axios from 'axios'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { blobValidate } from '@/utils/ruoyi' import { blobValidate } from '@/utils/ruoyi'
const baseURL = import.meta.env.VITE_APP_BASE_API const baseURL = import.meta.env.VITE_APP_BASE_API
@ -15,12 +16,12 @@ export default {
responseType: 'blob', responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() } headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(async (res) => { }).then(async (res) => {
const isLogin = await this.blobValidate(res.data); const isLogin = await blobValidate(res.data);
if (isLogin) { if (isLogin) {
const blob = new Blob([res.data]) const blob = new Blob([res.data])
this.saveAs(blob, decodeURI(res.headers['download-filename'])) this.saveAs(blob, decodeURI(res.headers['download-filename']))
} else { } else {
ElMessage.error('无效的会话,或者会话已过期,请重新登录。'); this.printErrMsg(res.data);
} }
}) })
}, },
@ -32,12 +33,12 @@ export default {
responseType: 'blob', responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() } headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(async (res) => { }).then(async (res) => {
const isLogin = await this.blobValidate(res.data); const isLogin = await blobValidate(res.data);
if (isLogin) { if (isLogin) {
const blob = new Blob([res.data]) const blob = new Blob([res.data])
this.saveAs(blob, decodeURI(res.headers['download-filename'])) this.saveAs(blob, decodeURI(res.headers['download-filename']))
} else { } else {
ElMessage.error('无效的会话,或者会话已过期,请重新登录。'); this.printErrMsg(res.data);
} }
}) })
}, },
@ -54,12 +55,18 @@ export default {
const blob = new Blob([res.data], { type: 'application/zip' }) const blob = new Blob([res.data], { type: 'application/zip' })
this.saveAs(blob, name) this.saveAs(blob, name)
} else { } else {
ElMessage.error('无效的会话,或者会话已过期,请重新登录。'); this.printErrMsg(res.data);
} }
}) })
}, },
saveAs(text, name, opts) { saveAs(text, name, opts) {
saveAs(text, name, opts); saveAs(text, name, opts);
},
async printErrMsg(data) {
const resText = await data.text();
const rspObj = JSON.parse(resText);
const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
ElMessage.error(errMsg);
} }
} }

@ -108,7 +108,10 @@ export function download(url, params, filename) {
const blob = new Blob([data]) const blob = new Blob([data])
saveAs(blob, filename) saveAs(blob, filename)
} else { } else {
ElMessage.error('无效的会话,或者会话已过期,请重新登录。'); const resText = await data.text();
const rspObj = JSON.parse(resText);
const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
ElMessage.error(errMsg);
} }
downloadLoadingInstance.close(); downloadLoadingInstance.close();
}).catch((r) => { }).catch((r) => {

Loading…
Cancel
Save