diff --git a/src/plugins/download.js b/src/plugins/download.js index 69448cf..d4eeabd 100644 --- a/src/plugins/download.js +++ b/src/plugins/download.js @@ -2,6 +2,7 @@ import axios from 'axios' import { ElMessage } from 'element-plus' import { saveAs } from 'file-saver' import { getToken } from '@/utils/auth' +import errorCode from '@/utils/errorCode' import { blobValidate } from '@/utils/ruoyi' const baseURL = import.meta.env.VITE_APP_BASE_API @@ -15,12 +16,12 @@ export default { responseType: 'blob', headers: { 'Authorization': 'Bearer ' + getToken() } }).then(async (res) => { - const isLogin = await this.blobValidate(res.data); + const isLogin = await blobValidate(res.data); if (isLogin) { const blob = new Blob([res.data]) this.saveAs(blob, decodeURI(res.headers['download-filename'])) } else { - ElMessage.error('无效的会话,或者会话已过期,请重新登录。'); + this.printErrMsg(res.data); } }) }, @@ -32,12 +33,12 @@ export default { responseType: 'blob', headers: { 'Authorization': 'Bearer ' + getToken() } }).then(async (res) => { - const isLogin = await this.blobValidate(res.data); + const isLogin = await blobValidate(res.data); if (isLogin) { const blob = new Blob([res.data]) this.saveAs(blob, decodeURI(res.headers['download-filename'])) } else { - ElMessage.error('无效的会话,或者会话已过期,请重新登录。'); + this.printErrMsg(res.data); } }) }, @@ -54,12 +55,18 @@ export default { const blob = new Blob([res.data], { type: 'application/zip' }) this.saveAs(blob, name) } else { - ElMessage.error('无效的会话,或者会话已过期,请重新登录。'); + this.printErrMsg(res.data); } }) }, 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); } } diff --git a/src/utils/request.js b/src/utils/request.js index f4ea1d1..ffd5146 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -108,7 +108,10 @@ export function download(url, params, filename) { const blob = new Blob([data]) saveAs(blob, filename) } 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(); }).catch((r) => {