From 6f0c15f71998bb08e5476ca04da8f6def7327250 Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期五, 24 二月 2023 15:42:17 +0800
Subject: [PATCH] 增加本地下载参数
---
src/views/tool/gen/index.vue | 3 ++-
src/plugins/download.js | 19 +++++++++++++++----
README.md | 33 +++++++++++++++++++++++++++++++--
3 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 2fe3c64..31dd0a6 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
npm run build:prod
```
-## ~~~~~~~~~~~~ 淇敼闂锛�2023-02-23
+## ~~~~~ 淇敼闂锛�2023-02-23
1.鍦� env.development 涓厤缃殑鍚庡彴鍦板潃涓嶇敓鏁堬紝蹇呴』鍦� requestUtils.js涓浐瀹氬�兼墠琛屻��
瑙ｅ喅锛氶渶瑕佸紕鍒伴厤缃枃浠朵腑锛屾敮鎸侊細dev銆乸rod绛夐厤缃枃浠朵繚鎸佷竴鑷淬��
@@ -44,4 +44,33 @@
---------------> 浠ヤ笂闂浼樺厛瑙ｅ喅锛屼笅闈㈢殑鏄鏋舵�ф暣浣撹�冭檻锛岄渶瑕佸湪鏂伴」鐩惎鍔ㄥ墠閫愭瀹屽杽鍗冲彲銆�
### 4.绯荤粺鏉冮檺涓庤矾鐢�
-鐢变簬
+鐢变簬鍚庡彴鏉冮檺鏄拡瀵筓RL鍋氭嫤鎴獙璇佺殑锛屽洜姝よ�冭檻鍓嶇鑳戒笌鍚庡彴杩斿洖鐨勮矾鐢变繚鎸佷竴鑷达紝缁撳悎浣跨敤锛岃兘鏂逛究鍓嶇銆�
+ * 1) API涓渶瑕佸啓璋冪敤鎺ュ彛鐨� url锛�
+ * 2) 椤甸潰涓紝闇�瑕侀厤缃寜閽潈闄愶紝濡�: system:user:list锛屽叾瀹炶繖涓氨鏄痑pi url涓幓鎺夊墠缂�鐨勫悗閮ㄥ垎锛岃繖鏄彲浠ョ粺涓�澶勭悊鐨勩��
+<p>
+1锛夌ず渚�1锛氱敤鎴锋煡璇㈠垪琛紙瀹屽叏鍖归厤锛�<br>
+api鍦板潃锛�/system/user/list<br>
+鍔熻兘鏉冮檺锛歴ystem:user:list --> /system/user/list<br>
+</p>
+<p>
+2锛夌ず渚�2锛氱敤鎴疯鎯呮煡鐪嬶紙鍔ㄦ�佸弬鏁板尮閰嶏級<br>
+api鍦板潃锛�/system/user/view/* --> /system/user/view/123456<br>
+鍔熻兘鏉冮檺锛歴ystem:user:view:query --> /system/user/view/*<br>
+</p>
+<p>
+3锛夌ず渚�3锛氱敤鎴疯鎯呮煡鐪嬶紙閫氶厤绗﹀尮閰嶏細绮楃矑搴︽潈闄愶級<br>
+api鍦板潃锛堟煡璇㈡巿鏉冭鑹诧級锛�/system/user/select/authRole/* --> /system/user/select/authRole/123456<br>
+api鍦板潃锛堥�夋嫨瑙掕壊鍒楄〃锛夛細/system/user/select/role/* --> /system/user/select/role/123456<br>
+鍔熻兘鏉冮檺锛歴ystem:user:select:** --> /system/user/select/**<br>
+</p>
+<p>
+<s>A.鍦ㄩ〉闈腑锛屼负鏌愪釜鎸夐挳鏉冮檺璁剧疆鈥滄潈闄愮偣ID鈥濇椂锛屽簲褰撲弗鏍兼寜鐓т互涓婅鑼冨姣旓紝闇�瑕佸墠绔仛涓�浜涚畝鍗曠殑瑙ｆ瀽锛涚洰鍓嶈嫢渚濅技涔庢槸浠呬綔瀛楃涓插尮閰嶃��<br>
+姣斿锛歴ystem:user:select:**杩欑锛岄渶瑕佸皾璇�</s>
+
+
+B.鍓嶇鍦ㄦ牴鎹笟鍔¤烦杞埌鏂扮晫闈㈡椂鐨勮矾鐢辫矾寰勶紝灏藉彲鑳戒笌鍚庡彴淇濇寔涓�鑷达紝姣斿: this.$router.push("/system/user-auth/role/" + userId);
+杩欑璺緞涓庡悗鍙板畾涔夊樊璺濊繃澶э紝鍙互鑰冭檻: /system/user/role/list锛岃繖鏍峰鏋滃皢鏉ヨ鎺у埗鐢ㄦ埛鏃犳硶璁块棶"瑙掕壊鍒嗛厤"鐣岄潰锛屾坊鍔犳潈闄愮偣椋庢牸鏄竴鑷寸殑锛屽惁鍒欒矾寰勫鍑哄垎鏁ｄ笉鍒╀簬缁存姢銆�<br>
+</p>
+
+### 5.缁勪欢鏍囧噯鍖�
+
diff --git a/src/plugins/download.js b/src/plugins/download.js
index 8cb5e22..99ebcd4 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -40,11 +40,22 @@
}
})
},
- zip(url, name) {
- var url = globalConf.ftpUrl + url;
+
+ /**
+ * 涓嬭浇zip鏂囦欢锛屽鏋渓ocal瀛樺湪鍊硷紝鍒欎粠鏈湴涓嬭浇鏂囦欢
+ * @param url 涓氬姟閾炬帴
+ * @param name 涓嬭浇淇濆瓨鐨勬枃浠跺悕
+ * @param local 鍙涓嶄负绌猴紝灏辫〃绀轰粠鏈湴涓嬭浇
+ * @date 2023-02-24 鏃跺厠鑻辨坊鍔� local 鍙傛暟
+ */
+ zip(url, name, local) {
+ let fullUrl = globalConf.ftpUrl + url;
+ if(local !== null && local !== ""){
+ fullUrl = globalConf.baseUrl + url;
+ }
axios({
method: 'get',
- url: url,
+ url: fullUrl,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(async (res) => {
@@ -53,7 +64,7 @@
const blob = new Blob([res.data], { type: 'application/zip' })
this.saveAs(blob, name)
} else {
- this.printErrMsg(res.data);
+ await this.printErrMsg(res.data);
}
})
},
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 8dfb0c5..6915032 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -285,7 +285,8 @@
this.$modal.msgError("璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁");
return;
}
- this.$download.zip("/tool/gen/db/gen_po/" + tableNames, tableNames);
+ // this.$download.zip("/tool/gen/db/gen_po/" + tableNames, tableNames);
+ this.$download.zip("/tool/gen/db/gen_po/" + tableNames, tableNames, true);
},
/** 鍚屾鏁版嵁搴撴搷浣� */
--
Gitblit v1.9.1