From 29c46a15f9cb4fa3ea0f417cca0ac76ff35bd135 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 十二月 2021 12:37:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/plugins/download.js | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index 86e2031..aff6c38 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -8,8 +8,8 @@
const baseURL = process.env.VUE_APP_BASE_API
export default {
- name(name, isDelete = true) {
- var url = baseURL + "/common/download?fileName=" + encodeURI(name) + "&delete=" + isDelete
+ oss(ossId) {
+ var url = baseURL + '/system/oss/download/' + ossId
axios({
method: 'get',
url: url,
@@ -18,24 +18,7 @@
}).then(async (res) => {
const isLogin = await blobValidate(res.data);
if (isLogin) {
- const blob = new Blob([res.data])
- this.saveAs(blob, decodeURI(res.headers['download-filename']))
- } else {
- this.printErrMsg(res.data);
- }
- })
- },
- resource(resource) {
- var url = baseURL + "/common/download/resource?resource=" + encodeURI(resource);
- axios({
- method: 'get',
- url: url,
- responseType: 'blob',
- headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(async (res) => {
- const isLogin = await blobValidate(res.data);
- if (isLogin) {
- const blob = new Blob([res.data])
+ const blob = new Blob([res.data], { type: 'application/octet-stream' })
this.saveAs(blob, decodeURI(res.headers['download-filename']))
} else {
this.printErrMsg(res.data);
--
Gitblit v1.9.3