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() {