diff --git a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java
index 429cef6..84475b3 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java
@@ -66,8 +66,8 @@ public class DataRunNameController {
      */
     @PostMapping("/findTableValue")
     @Operation(summary = "获取数据库名",description = "返回所有数据库以及所有表的结果集")
-    public Result<List<DataValue>> findTableValue(@RequestParam(name = "basicId") String basicId){
+    public Result<List<DataValue>> findTableValue(@RequestParam(name = "basicId") String basicId,@RequestParam(name = "dataName") String dataName){
 
-        return Result.success(dataRunNameService.findTableValue(basicId));
+        return Result.success(dataRunNameService.findTableValue(basicId,dataName));
     }
 }
diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java
index 24e4fc0..74d1d08 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java
@@ -38,5 +38,5 @@ public interface DataRunNameService {
      * @param basicId 数据类型转换ID
      * @return 返回结果
      */
-    List<DataValue> findTableValue(String basicId);
+    List<DataValue> findTableValue(String basicId, String dataName);
 }
diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataNameServiceImpl.java
index f472d5c..3b233b5 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataNameServiceImpl.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataNameServiceImpl.java
@@ -39,7 +39,8 @@ public class DataNameServiceImpl
     public List<DataName> extractDataName() {
 
         String sql = null;
-        DruidDataSource druidDataSource = JdbcHelper.getConnRs();
+        String dataName= "core_data_warehouse";
+        DruidDataSource druidDataSource = JdbcHelper.getConnRs(dataName);
         sql = "SHOW DATABASES;";
         try {
             assert druidDataSource != null;
diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
index 4406e26..14667a5 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
@@ -153,11 +153,11 @@ public class DataRunNameServiceImpl implements DataRunNameService {
      * @return 返回结果
      */
     @Override
-    public List<DataValue> findTableValue(String basicId) {
+    public List<DataValue> findTableValue(String basicId, String dataName) {
 
         MySqlQuery mySqlQuery = new MySqlQuery();
         mySqlQuery.setDataSourceId(String.valueOf(basicId));
-        DruidDataSource connRs1 = JdbcHelper.getConnRs();
+        DruidDataSource connRs1 = JdbcHelper.getConnRs(dataName);
         DruidPooledConnection conn = null;
         try {
             conn = connRs1.getConnection();
diff --git a/cloud-property-server/src/main/java/com/muyu/server/util/JdbcHelper.java b/cloud-property-server/src/main/java/com/muyu/server/util/JdbcHelper.java
index 20edda2..1aa11fb 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/util/JdbcHelper.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/util/JdbcHelper.java
@@ -54,11 +54,11 @@ public class JdbcHelper {
      * 查询服务器上说有数据库名  连接池
      * @return
      */
-    public static DruidDataSource getConnRs() {
+    public static DruidDataSource getConnRs(String dataName) {
 
             try {
                 DruidDataSource druidDataSource = new DruidDataSource();
-                druidDataSource.setUrl("jdbc:mysql://21.12.0.10:3306/core_data_warehouse?useUnicode=true&characterEncoding" +
+                druidDataSource.setUrl("jdbc:mysql://21.12.0.10:3306/"+dataName+"?useUnicode=true&characterEncoding" +
                         "=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8");
                 druidDataSource.setUsername("root");
                 druidDataSource.setPassword("Bwie-8666");