From 1297d094cb5ee7305d151cd8b4a8a5659275ae97 Mon Sep 17 00:00:00 2001
From: 淡然逝去 <gitoshub@126.com>
Date: Thu, 16 Jun 2022 12:56:12 +0800
Subject: [PATCH] 使用 @Lazy，@AutoConfigureBefore注解解决循环引用及Bean重复问题，删除allow-bean-definition-overriding: true， allow-circular-references: true配置信息
---
ruoyi-ui/src/plugins/download.js | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index bc838fd..cfb7c24 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -1,6 +1,9 @@
-import { saveAs } from 'file-saver'
import axios from 'axios'
+import { Message } from 'element-ui'
+import { saveAs } from 'file-saver'
import { getToken } from '@/utils/auth'
+import errorCode from '@/utils/errorCode'
+import { blobValidate } from "@/utils/ruoyi";
const baseURL = process.env.VUE_APP_BASE_API
@@ -12,13 +15,24 @@
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(res => {
- const blob = new Blob([res.data], { type: 'application/zip' })
- this.saveAs(blob, name)
+ }).then(async (res) => {
+ const isLogin = await blobValidate(res.data);
+ if (isLogin) {
+ const blob = new Blob([res.data], { type: 'application/zip' })
+ this.saveAs(blob, name)
+ } else {
+ 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']
+ Message.error(errMsg);
}
}
--
Gitblit v1.9.3