diff --git a/.gitignore b/.gitignore
index b28673a4e5f95674f997c10d116408eeec07ec91..a482c7f6a8c8992cd9e6e17939273254595cac8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ out/
 target/
 build/
 logs/
+# jrebel
+rebel.xml
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
index c1b31fce64362072f12eae017e7f6a43adb49d0d..6efe27c9641aec5f7aa4aae8d8349087a3d903a2 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java
@@ -1,5 +1,6 @@
 package cn.bootx.platform.starter.code.gen.controller;
 
+import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
@@ -38,9 +39,11 @@ public class DatabaseTableController {
 
     @Operation(summary = "表列表分页")
     @GetMapping("/page")
-    public ResResult<Page<DatabaseTable>> page(@ParameterObject PageParam pageParam,
-            @ParameterObject DatabaseTable param) {
-        return Res.ok(databaseTableService.page(pageParam, param));
+    public ResResult<PageResult<DatabaseTable>> page(@ParameterObject PageParam pageParam,
+                                                     @ParameterObject DatabaseTable param,
+                                                     @ParameterObject String dataSourceCode)
+    {
+        return Res.ok(databaseTableService.page(pageParam, param,dataSourceCode));
     }
 
     @Operation(summary = "获取表信息")
@@ -57,8 +60,8 @@ public class DatabaseTableController {
 
     @Operation(summary = "获取表相关的代码生成参数信息")
     @GetMapping("/getTableGenParam")
-    public ResResult<TableGenParamDto> getTableGenParam(String tableName) {
-        return Res.ok(databaseTableService.getTableGenParam(tableName));
+    public ResResult<TableGenParamDto> getTableGenParam(String dataSourceCode, String tableName) {
+        return Res.ok(databaseTableService.getTableGenParam(dataSourceCode,tableName));
     }
 
 }
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java
index 04d30480b82317144024051048993eb8bb094a27..0111ce0cbca3a79ad4f4f20952de00a74949d03b 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java
@@ -15,6 +15,9 @@ import lombok.experimental.Accessors;
 @Schema(title = "代码生成参数")
 public class CodeGenParam {
 
+    @Schema(description = "数据库源")
+    private String dataSourceCode;
+
     @Schema(description = "表名")
     private String tableName;
 
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java
index f8a3110572033e62c3149484bc5d447fcd2e4380..dfb9e3c8ac236b57f36920671768296a84913198 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java
@@ -15,6 +15,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.NamingCase;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -135,6 +137,7 @@ public class CodeGeneratorService {
      * 生成代码文件压缩包
      */
     @SneakyThrows
+    @DS("#codeGenParam.getDataSourceCode()")
     public ResponseEntity<byte[]> genCodeZip(CodeGenParam codeGenParam) {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
index 67e405739f0aa03b204825837b01039cba1d93fe..562ae2b126b0561f9a375ce653b032b3543cdf63 100644
--- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
+++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java
@@ -1,6 +1,7 @@
 package cn.bootx.platform.starter.code.gen.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
+import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.starter.code.gen.dao.DatabaseTableMapper;
@@ -9,6 +10,8 @@ import cn.bootx.platform.starter.code.gen.entity.DatabaseColumn;
 import cn.bootx.platform.starter.code.gen.entity.DatabaseTable;
 import cn.bootx.platform.starter.code.gen.util.CodeGenUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
@@ -16,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.stereotype.Service;
 
+import javax.sql.DataSource;
 import java.util.List;
 
 /**
@@ -30,6 +34,7 @@ import java.util.List;
 public class DatabaseTableService {
 
     private final DatabaseTableMapper databaseTableMapper;
+    private final DataSource bigScreen;
 
     /**
      * 查询全部
@@ -42,7 +47,8 @@ public class DatabaseTableService {
     /**
      * 分页
      */
-    public Page<DatabaseTable> page(PageParam pageParam, DatabaseTable param) {
+    @DS("#dataSourceName")
+    public PageResult<DatabaseTable> page(PageParam pageParam, DatabaseTable param, String dataSourceName) {
         val mpPage = MpUtil.getMpPage(pageParam, DatabaseTable.class);
         QueryWrapper<DatabaseTable> wrapper = new QueryWrapper<>();
 
@@ -50,7 +56,8 @@ public class DatabaseTableService {
             .like(StrUtil.isNotBlank(param.getTableComment()), DatabaseTable.Fields.tableComment,
                     param.getTableComment())
             .orderByDesc(DatabaseTable.Fields.createTime, DatabaseTable.Fields.tableName);
-        return databaseTableMapper.page(mpPage, wrapper);
+
+        return MpUtil.convert2PageResult(databaseTableMapper.page(mpPage, wrapper)) ;
     }
 
     /**
@@ -70,7 +77,8 @@ public class DatabaseTableService {
     /**
      * 获取表相关的代码生成参数信息
      */
-    public TableGenParamDto getTableGenParam(String tableName) {
+    @DS("#dataSourceCode")
+    public TableGenParamDto getTableGenParam(String dataSourceCode, String tableName) {
         DatabaseTable databaseTable = this.findByTableName(tableName);
         String entityName = CodeGenUtil.tableToJava(databaseTable.getTableName());
         return new TableGenParamDto().setEntityName(entityName).setModule(entityName.toLowerCase());
diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml
index ae78010bc99f9054262a70db0e28146a24ad16f9..2b178fd78ec1084976bdcfb21dfd14f40417263e 100644
--- a/bootx-start/src/main/resources/application-dev.yml
+++ b/bootx-start/src/main/resources/application-dev.yml
@@ -103,7 +103,7 @@ bootx:
         "[身份识别和管理]": cn.bootx.platform.iam
         "[消息服务]": cn.bootx.platform.notice
         "[演示模块]": cn.bootx.demo
-        "[可视化大屏]": cn.bootx.visualization
+        "[可视化大屏]": cn.bootx.platform.visualization
         "[第三方对接]":
           - cn.bootx.platform.starter.dingtalk
           - cn.bootx.platform.starter.wecom