From 604c671d41a895cb4ee01280aa3bd1cac5d82289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sun, 6 Mar 2022 11:22:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=20=E5=85=B3=E4=BA=8E=E6=95=B0=E6=8D=AE=E6=BA=90=E7=9A=84?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2(=E5=90=8E=E7=BB=AD=E5=9C=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=81=9A=E4=B8=AA=E8=BE=93=E5=85=A5=E6=A1=86=20?=
 =?UTF-8?q?=E6=9C=89=E5=85=B4=E8=B6=A3=E7=9A=84=E5=8F=AF=E4=BB=A5pr)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/tool/gen.js          | 20 +++++++++-----------
 ruoyi-ui/src/plugins/download.js      |  5 ++++-
 ruoyi-ui/src/views/tool/gen/index.vue |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/api/tool/gen.js b/ruoyi-ui/src/api/tool/gen.js
index 5bea27228..65ddfea4d 100644
--- a/ruoyi-ui/src/api/tool/gen.js
+++ b/ruoyi-ui/src/api/tool/gen.js
@@ -1,11 +1,9 @@
 import request from '@/utils/request'
 
-const dataName = "master";
-
 // 查询生成表数据
 export function listTable(query) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/list',
     method: 'get',
     params: query
@@ -15,7 +13,7 @@ export function listTable(query) {
 // 查询db数据库列表
 export function listDbTable(query) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/db/list',
     method: 'get',
     params: query
@@ -25,7 +23,7 @@ export function listDbTable(query) {
 // 查询表详细信息
 export function getGenTable(tableId) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/' + tableId,
     method: 'get'
   })
@@ -34,7 +32,7 @@ export function getGenTable(tableId) {
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen',
     method: 'put',
     data: data
@@ -44,7 +42,7 @@ export function updateGenTable(data) {
 // 导入表
 export function importTable(data) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/importTable',
     method: 'post',
     params: data
@@ -54,7 +52,7 @@ export function importTable(data) {
 // 预览生成代码
 export function previewTable(tableId) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/preview/' + tableId,
     method: 'get'
   })
@@ -63,7 +61,7 @@ export function previewTable(tableId) {
 // 删除表数据
 export function delTable(tableId) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/' + tableId,
     method: 'delete'
   })
@@ -72,7 +70,7 @@ export function delTable(tableId) {
 // 生成代码（自定义路径）
 export function genCode(tableName) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/genCode/' + tableName,
     method: 'get'
   })
@@ -81,7 +79,7 @@ export function genCode(tableName) {
 // 同步数据库
 export function synchDb(tableName) {
   return request({
-    headers: { datasource: dataName },
+    headers: { 'datasource': localStorage.getItem("dataName") },
     url: '/tool/gen/synchDb/' + tableName,
     method: 'get'
   })
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index 726ef547f..85138bb17 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -38,7 +38,10 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      headers: {
+        'Authorization': 'Bearer ' + getToken(),
+        'datasource': localStorage.getItem("dataName")
+      }
     }).then(async (res) => {
       const isLogin = await blobValidate(res.data);
       if (isLogin) {
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 98be64e4d..0f7f22577 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -232,6 +232,7 @@ export default {
     };
   },
   created() {
+    localStorage.setItem("dataName", "master");
     this.getList();
   },
   activated() {