From 6b988bd582bfcd17fee48c476a5a6e5cc172b0d5 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 10:08:33 +0800
Subject: [PATCH] dev-2

---
 src/plugins/download.ts |  105 +++++++++++++++++++++++++++-------------------------
 1 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 3e963a7..ef66b3a 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -1,60 +1,65 @@
 import axios from 'axios';
 import FileSaver from 'file-saver';
-import { getToken } from '@/utils/auth';
 import errorCode from '@/utils/errorCode';
 import { blobValidate } from '@/utils/ruoyi';
 import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
+import { globalHeaders } from '@/utils/request';
 
 const baseURL = import.meta.env.VITE_APP_BASE_API;
 let downloadLoadingInstance: LoadingInstance;
 export default {
-	async oss(ossId: string | number) {
-		const url = baseURL + '/system/oss/download/' + ossId;
-		downloadLoadingInstance = ElLoading.service({ text: '姝e湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
-		try {
-			const res = await axios({
-				method: 'get',
-				url: url,
-				responseType: 'blob',
-				headers: { Authorization: 'Bearer ' + getToken() }
-			});
-			const isBlob = blobValidate(res.data);
-			if (isBlob) {
-				const blob = new Blob([res.data], { type: 'application/octet-stream' });
-				FileSaver.saveAs(blob, decodeURIComponent(res.headers['download-filename'] as string));
-			} else {
-				this.printErrMsg(res.data);
-			}
-			downloadLoadingInstance.close();
-		} catch (r) {
-			console.error(r);
-			ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒');
-			downloadLoadingInstance.close();
-		}
-	},
-	async zip(url: string, name: string) {
-		url = baseURL + url;
-		const res = await axios({
-			method: 'get',
-			url: url,
-			responseType: 'blob',
-			headers: {
-				Authorization: 'Bearer ' + getToken(),
-				datasource: localStorage.getItem('dataName')
-			}
-		});
-		const isBlob = blobValidate(res.data);
-		if (isBlob) {
-			const blob = new Blob([res.data], { type: 'application/zip' });
-			FileSaver.saveAs(blob, name);
-		} else {
-			this.printErrMsg(res.data);
-		}
-	},
-	async printErrMsg(data: any) {
-		const resText = await data.text();
-		const rspObj = JSON.parse(resText);
-		const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'];
-		ElMessage.error(errMsg);
-	}
+  async oss(ossId: string | number) {
+    const url = baseURL + '/resource/oss/download/' + ossId;
+    downloadLoadingInstance = ElLoading.service({ text: '姝e湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
+    try {
+      const res = await axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: globalHeaders()
+      });
+      const isBlob = blobValidate(res.data);
+      if (isBlob) {
+        const blob = new Blob([res.data], { type: 'application/octet-stream' });
+        FileSaver.saveAs(blob, decodeURIComponent(res.headers['download-filename'] as string));
+      } else {
+        this.printErrMsg(res.data);
+      }
+      downloadLoadingInstance.close();
+    } catch (r) {
+      console.error(r);
+      ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒');
+      downloadLoadingInstance.close();
+    }
+  },
+  async zip(url: string, name: string) {
+    url = baseURL + url;
+    downloadLoadingInstance = ElLoading.service({ text: '姝e湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
+    try {
+      const res = await axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: globalHeaders()
+      });
+      const isBlob = blobValidate(res.data);
+      if (isBlob) {
+        const blob = new Blob([res.data], { type: 'application/zip' });
+        FileSaver.saveAs(blob, name);
+      } else {
+        this.printErrMsg(res.data);
+      }
+      downloadLoadingInstance.close();
+    } catch (r) {
+      console.error(r);
+      ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒');
+      downloadLoadingInstance.close();
+    }
+  },
+  async printErrMsg(data: any) {
+    const resText = await data.text();
+    const rspObj = JSON.parse(resText);
+    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'];
+    ElMessage.error(errMsg);
+  }
 };

--
Gitblit v1.9.3