From db07f4a3545dab8b54e7c85f7747eb0976e2dbef Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 01 Jan 2022 09:47:14 +0800
Subject: [PATCH] 预览组件支持多图显示
---
ruoyi-ui/src/utils/request.js | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 31 deletions(-)
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 5d1cfd3..1b2d781 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -1,9 +1,14 @@
import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
+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;
+// 是否显示重新登录
+let isReloginShow;
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
@@ -16,9 +21,17 @@
// request拦截器
service.interceptors.request.use(config => {
+ // 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+ }
+ // get请求映射params参数
+ if (config.method === 'get' && config.params) {
+ let url = config.url + '?' + tansParams(config.params);
+ url = url.slice(0, -1);
+ config.params = {};
+ config.url = url;
}
return config
}, error => {
@@ -28,31 +41,44 @@
// 响应拦截器
service.interceptors.response.use(res => {
+ // 未设置状态码则默认成功状态
const code = res.data.code || 200;
- const message = errorCode[code] || res.data.msg || errorCode['default']
+ // 获取错误信息
+ 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(
- '登录状态已过期，您可以继续留在该页面，或者重新登录',
- '系统提示',
- {
+ if (!isReloginShow) {
+ isReloginShow = true;
+ MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
+ isReloginShow = false;
store.dispatch('LogOut').then(() => {
- location.reload() // 为了重新实例化vue-router对象 避免bug
+ // 如果是登录页面不需要重新加载
+ if (window.location.hash.indexOf("#/login") != 0) {
+ location.href = '/index';
+ }
})
- })
+ }).catch(() => {
+ isReloginShow = false;
+ });
+ }
+ return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) {
Message({
- message: message,
+ message: msg,
type: 'error'
})
- return Promise.reject(new Error(message))
+ return Promise.reject(new Error(msg))
} else if (code !== 200) {
Notification.error({
- title: message
+ title: msg
})
return Promise.reject('error')
} else {
@@ -61,8 +87,18 @@
},
error => {
console.log('err' + error)
+ let { message } = error;
+ if (message == "Network Error") {
+ message = "后端接口连接异常";
+ }
+ else if (message.includes("timeout")) {
+ message = "系统接口请求超时";
+ }
+ else if (message.includes("Request failed with status code")) {
+ message = "系统接口" + message.substr(message.length - 3) + "异常";
+ }
Message({
- message: error.message,
+ message: message,
type: 'error',
duration: 5 * 1000
})
@@ -72,31 +108,28 @@
// 通用下载方法
export function download(url, params, filename) {
+ downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
return service.post(url, params, {
- transformRequest: [(params) => {
- return tansParams(params)
- }],
+ 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])
- if ('download' in document.createElement('a')) {
- const elink = document.createElement('a')
- elink.download = filename
- elink.style.display = 'none'
- elink.href = URL.createObjectURL(blob)
- document.body.appendChild(elink)
- elink.click()
- URL.revokeObjectURL(elink.href)
- document.body.removeChild(elink)
+ }).then(async (data) => {
+ const isLogin = await blobValidate(data);
+ if (isLogin) {
+ const blob = new Blob([data])
+ saveAs(blob, filename)
} else {
- navigator.msSaveBlob(blob, filename)
+ const resText = await data.text();
+ const rspObj = JSON.parse(resText);
+ const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+ Message.error(errMsg);
}
+ downloadLoadingInstance.close();
}).catch((r) => {
console.error(r)
+ Message.error('下载文件出现错误，请联系管理员！')
+ downloadLoadingInstance.close();
})
}
-
-
export default service
--
Gitblit v1.9.3