From f3d58432c362120c2a8fa5bb5d194d8cc8e9ab50 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 30 十二月 2024 10:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/plugins/download.ts | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 347c18b..2cdfa50 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -9,9 +9,7 @@
let downloadLoadingInstance: LoadingInstance;
export default {
async oss(ossId: string | number) {
- // const url = baseURL + '/resource/oss/download/' + ossId;
- // const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + window.JavaScriptMe.getAppCenterToken() + '/' + ossId;
- const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + ossId;
+ const url = baseURL + '/resource/oss/download/' + ossId;
downloadLoadingInstance = ElLoading.service({ text: '姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
try {
const res = await axios({
@@ -65,10 +63,7 @@
ElMessage.error(errMsg);
},
async ossDown(ossId: string | number,pawd:string) {
- // const url = baseURL + '/resource/oss/download/' + ossId +'/' + pawd;
- // const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + window.JavaScriptMe.getAppCenterToken() +'/' + ossId +'/' + pawd;
- const url = baseURL + '/56e038d545bb4fa3834d03c368d74118/' + ossId +'/' + pawd;
-
+ const url = baseURL + '/resource/oss/download/' + ossId +'/' + pawd;
downloadLoadingInstance = ElLoading.service({ text: '姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
try {
const res = await axios({
--
Gitblit v1.8.0