diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
index 71c9226d8a..43590d14e8 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
@@ -24,6 +24,9 @@ object DatasourceClientConfig {
   var METADATA_SERVICE_MODULE: CommonVars[String] =
     CommonVars.apply("linkis.server.mdq.module.name", "metadataQuery")
 
+  var METADATA_OLD_SERVICE_MODULE: CommonVars[String] =
+    CommonVars.apply("linkis.server.mdq.module.name", "metadatamanager")
+
   var DATA_SOURCE_SERVICE_MODULE: CommonVars[String] =
     CommonVars.apply("linkis.server.dsm.module.name", "data-source-manager")
 
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
index 6c40501721..670f14c4c6 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
@@ -66,7 +66,7 @@ object DataSourceTestConnectAction {
     }
 
     def build(): DataSourceTestConnectAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
       if (version == null) throw new DataSourceClientBuilderException(VERSION_NEEDED.getErrorDesc)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
index c405d46e09..d537e69c32 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
@@ -55,7 +55,7 @@ object DeleteDataSourceAction {
 
     def builder(): DeleteDataSourceAction = {
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
 
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
index bbcf537ac0..7eff05c55c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
@@ -56,7 +56,7 @@ object ExpireDataSourceAction {
     }
 
     def build(): ExpireDataSourceAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
index 452187ac9b..fb4921de1c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
@@ -59,7 +59,7 @@ object GetConnectParamsByDataSourceIdAction {
     }
 
     def build(): GetConnectParamsByDataSourceIdAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
index 0ba78bd7a7..4ac2cb659e 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
@@ -53,7 +53,7 @@ object GetDataSourceVersionsAction {
     }
 
     def build(): GetDataSourceVersionsAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
index e96d088ca7..662c28add2 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
@@ -59,7 +59,7 @@ object GetInfoByDataSourceIdAction {
     }
 
     def build(): GetInfoByDataSourceIdAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
       if (system == null) throw new DataSourceClientBuilderException(SYSTEM_NEEDED.getErrorDesc)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
index 7729747afc..ae912d17f4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
@@ -17,19 +17,36 @@
 
 package org.apache.linkis.datasource.client.request
 
-import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
+import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
+  METADATA_OLD_SERVICE_MODULE,
+  METADATA_SERVICE_MODULE
+}
 import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
 import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
 import org.apache.linkis.httpclient.request.GetAction
 
-class MetadataGetColumnsAction extends GetAction with DataSourceAction {
+import org.apache.commons.lang3.StringUtils
 
+class MetadataGetColumnsAction extends GetAction with DataSourceAction {
+  private var dataSourceId: Long = _
   private var dataSourceName: String = _
 
   private var database: String = _
   private var table: String = _
 
-  override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getColumns")
+  override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
+    Array(METADATA_SERVICE_MODULE.getValue, "getColumns")
+  } else {
+    Array(
+      METADATA_OLD_SERVICE_MODULE.getValue,
+      "columns",
+      dataSourceId.toString,
+      "db",
+      database,
+      "table",
+      table
+    )
+  }
 
   private var user: String = _
 
@@ -42,6 +59,7 @@ object MetadataGetColumnsAction {
   def builder(): Builder = new Builder
 
   class Builder private[MetadataGetColumnsAction] () {
+    private var dataSourceId: Long = _
     private var dataSourceName: String = _
     private var database: String = _
     private var table: String = _
@@ -53,6 +71,20 @@ object MetadataGetColumnsAction {
       this
     }
 
+    /**
+     * get value form dataSourceId is deprecated, suggest to use dataSourceName
+     *
+     * @param dataSourceId
+     *   datasourceId
+     * @return
+     *   builder
+     */
+    @deprecated
+    def setDataSourceId(dataSourceId: Long): Builder = {
+      this.dataSourceId = dataSourceId
+      this
+    }
+
     def setDataSourceName(dataSourceName: String): Builder = {
       this.dataSourceName = dataSourceName
       this
@@ -74,7 +106,7 @@ object MetadataGetColumnsAction {
     }
 
     def build(): MetadataGetColumnsAction = {
-      if (dataSourceName == null) {
+      if (dataSourceName == null && dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
       }
       if (database == null) throw new DataSourceClientBuilderException(DATABASE_NEEDED.getErrorDesc)
@@ -83,6 +115,7 @@ object MetadataGetColumnsAction {
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
 
       val metadataGetColumnsAction = new MetadataGetColumnsAction
+      metadataGetColumnsAction.dataSourceId = this.dataSourceId
       metadataGetColumnsAction.dataSourceName = this.dataSourceName
       metadataGetColumnsAction.database = this.database
       metadataGetColumnsAction.table = this.table
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
index 3287dafbaf..53df5e331f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
@@ -17,16 +17,26 @@
 
 package org.apache.linkis.datasource.client.request
 
-import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
+import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
+  METADATA_OLD_SERVICE_MODULE,
+  METADATA_SERVICE_MODULE
+}
 import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
 import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
 import org.apache.linkis.httpclient.request.GetAction
 
+import org.apache.commons.lang3.StringUtils
+
 class MetadataGetDatabasesAction extends GetAction with DataSourceAction {
 
+  private var dataSourceId: Long = _
   private var dataSourceName: String = _
 
-  override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getDatabases")
+  override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
+    Array(METADATA_SERVICE_MODULE.getValue, "getDatabases")
+  } else {
+    Array(METADATA_OLD_SERVICE_MODULE.getValue, "dbs", dataSourceId.toString)
+  }
 
   private var user: String = _
 
@@ -39,6 +49,7 @@ object MetadataGetDatabasesAction {
   def builder(): Builder = new Builder
 
   class Builder private[MetadataGetDatabasesAction] () {
+    private var dataSourceId: Long = _
     private var dataSourceName: String = _
     private var system: String = _
     private var user: String = _
@@ -48,6 +59,20 @@ object MetadataGetDatabasesAction {
       this
     }
 
+    /**
+     * get value form dataSourceId is deprecated, suggest to use dataSourceName
+     *
+     * @param dataSourceId
+     *   datasourceId
+     * @return
+     *   builder
+     */
+    @deprecated
+    def setDataSourceId(dataSourceId: Long): Builder = {
+      this.dataSourceId = dataSourceId
+      this
+    }
+
     def setDataSourceName(dataSourceName: String): Builder = {
       this.dataSourceName = dataSourceName
       this
@@ -59,13 +84,14 @@ object MetadataGetDatabasesAction {
     }
 
     def build(): MetadataGetDatabasesAction = {
-      if (dataSourceName == null) {
+      if (dataSourceName == null && dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
       }
       if (system == null) throw new DataSourceClientBuilderException(SYSTEM_NEEDED.getErrorDesc)
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
 
       val metadataGetDatabasesAction = new MetadataGetDatabasesAction
+      metadataGetDatabasesAction.dataSourceId = this.dataSourceId
       metadataGetDatabasesAction.dataSourceName = this.dataSourceName
       metadataGetDatabasesAction.setParameter("system", system)
       metadataGetDatabasesAction.setUser(user)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
index f17552c6cd..769d43d80c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
@@ -17,19 +17,36 @@
 
 package org.apache.linkis.datasource.client.request
 
-import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
+import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
+  METADATA_OLD_SERVICE_MODULE,
+  METADATA_SERVICE_MODULE
+}
 import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
 import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
 import org.apache.linkis.httpclient.request.GetAction
 
+import org.apache.commons.lang3.StringUtils
+
 class MetadataGetPartitionsAction extends GetAction with DataSourceAction {
+  private var dataSourceId: Long = _
   private var dataSourceName: String = _
   private var database: String = _
   private var table: String = _
   private var traverse: Boolean = false
 
-  override def suffixURLs: Array[String] =
+  override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
     Array(METADATA_SERVICE_MODULE.getValue, "getPartitions")
+  } else {
+    Array(
+      METADATA_OLD_SERVICE_MODULE.getValue,
+      "partitions",
+      dataSourceId.toString,
+      "db",
+      database,
+      "table",
+      table
+    )
+  }
 
   private var user: String = _
 
@@ -42,6 +59,7 @@ object MetadataGetPartitionsAction {
   def builder(): Builder = new Builder
 
   class Builder private[MetadataGetPartitionsAction] () {
+    private var dataSourceId: Long = _
     private var dataSourceName: String = _
     private var database: String = _
     private var table: String = _
@@ -54,6 +72,20 @@ object MetadataGetPartitionsAction {
       this
     }
 
+    /**
+     * get value form dataSourceId is deprecated, suggest to use dataSourceName
+     *
+     * @param dataSourceId
+     *   datasourceId
+     * @return
+     *   builder
+     */
+    @deprecated
+    def setDataSourceId(dataSourceId: Long): Builder = {
+      this.dataSourceId = dataSourceId
+      this
+    }
+
     def setDataSourceName(dataSourceName: String): Builder = {
       this.dataSourceName = dataSourceName
       this
@@ -80,7 +112,7 @@ object MetadataGetPartitionsAction {
     }
 
     def build(): MetadataGetPartitionsAction = {
-      if (dataSourceName == null) {
+      if (dataSourceName == null && dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
       }
       if (database == null) throw new DataSourceClientBuilderException(DATABASE_NEEDED.getErrorDesc)
@@ -88,6 +120,8 @@ object MetadataGetPartitionsAction {
       if (system == null) throw new DataSourceClientBuilderException(SYSTEM_NEEDED.getErrorDesc)
 
       val metadataGetPartitionsAction = new MetadataGetPartitionsAction
+
+      metadataGetPartitionsAction.dataSourceId = this.dataSourceId
       metadataGetPartitionsAction.dataSourceName = this.dataSourceName
       metadataGetPartitionsAction.database = this.database
       metadataGetPartitionsAction.table = this.table
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
index fd41d70da3..b9d9ed28da 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
@@ -17,19 +17,37 @@
 
 package org.apache.linkis.datasource.client.request
 
-import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
+import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
+  METADATA_OLD_SERVICE_MODULE,
+  METADATA_SERVICE_MODULE
+}
 import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
 import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
 import org.apache.linkis.httpclient.request.GetAction
 
+import org.apache.commons.lang3.StringUtils
+
 class MetadataGetTablePropsAction extends GetAction with DataSourceAction {
+
+  private var dataSourceId: Long = _
   private var dataSourceName: String = _
 
   private var database: String = _
   private var table: String = _
 
-  override def suffixURLs: Array[String] =
+  override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
     Array(METADATA_SERVICE_MODULE.getValue, "getTableProps")
+  } else {
+    Array(
+      METADATA_OLD_SERVICE_MODULE.getValue,
+      "props",
+      dataSourceId.toString,
+      "db",
+      database,
+      "table",
+      table
+    )
+  }
 
   private var user: String = _
 
@@ -42,6 +60,7 @@ object MetadataGetTablePropsAction {
   def builder(): Builder = new Builder
 
   class Builder private[MetadataGetTablePropsAction] () {
+    private var dataSourceId: Long = _
     private var dataSourceName: String = _
     private var database: String = _
     private var table: String = _
@@ -53,6 +72,19 @@ object MetadataGetTablePropsAction {
       this
     }
 
+    /**
+     * get value form dataSourceId is deprecated, suggest to use dataSourceName
+     * @param dataSourceId
+     *   datasourceId
+     * @return
+     *   builder
+     */
+    @deprecated
+    def setDataSourceId(dataSourceId: Long): Builder = {
+      this.dataSourceId = dataSourceId
+      this
+    }
+
     def setDataSourceName(dataSourceName: String): Builder = {
       this.dataSourceName = dataSourceName
       this
@@ -74,7 +106,7 @@ object MetadataGetTablePropsAction {
     }
 
     def build(): MetadataGetTablePropsAction = {
-      if (dataSourceName == null) {
+      if (dataSourceName == null && dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
       }
       if (database == null) throw new DataSourceClientBuilderException(DATABASE_NEEDED.getErrorDesc)
@@ -83,6 +115,7 @@ object MetadataGetTablePropsAction {
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
 
       val metadataGetTablePropsAction = new MetadataGetTablePropsAction
+      metadataGetTablePropsAction.dataSourceId = this.dataSourceId
       metadataGetTablePropsAction.dataSourceName = this.dataSourceName
       metadataGetTablePropsAction.database = this.database
       metadataGetTablePropsAction.table = this.table
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
index 5c28ea028e..d2079bab46 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
@@ -17,16 +17,27 @@
 
 package org.apache.linkis.datasource.client.request
 
-import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
+import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
+  METADATA_OLD_SERVICE_MODULE,
+  METADATA_SERVICE_MODULE
+}
 import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
 import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
 import org.apache.linkis.httpclient.request.GetAction
 
+import org.apache.commons.lang3.StringUtils
+
 class MetadataGetTablesAction extends GetAction with DataSourceAction {
+
+  private var dataSourceId: Long = _
   private var dataSourceName: String = _
   private var database: String = _
 
-  override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getTables")
+  override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
+    Array(METADATA_SERVICE_MODULE.getValue, "getTables")
+  } else {
+    Array(METADATA_OLD_SERVICE_MODULE.getValue, "tables", dataSourceId.toString, "db", database)
+  }
 
   private var user: String = _
 
@@ -39,6 +50,7 @@ object MetadataGetTablesAction {
   def builder(): Builder = new Builder
 
   class Builder private[MetadataGetTablesAction] () {
+    private var dataSourceId: Long = _
     private var dataSourceName: String = _
     private var database: String = _
     private var system: String = _
@@ -49,8 +61,22 @@ object MetadataGetTablesAction {
       this
     }
 
-    def setDataSourceName(dataSourceId: String): Builder = {
-      this.dataSourceName = dataSourceId
+    def setDataSourceName(dataSourceName: String): Builder = {
+      this.dataSourceName = dataSourceName
+      this
+    }
+
+    /**
+     * get value form dataSourceId is deprecated, suggest to use dataSourceName
+     *
+     * @param dataSourceId
+     *   datasourceId
+     * @return
+     *   builder
+     */
+    @deprecated
+    def setDataSourceId(dataSourceId: Long): Builder = {
+      this.dataSourceId = dataSourceId
       this
     }
 
@@ -65,7 +91,7 @@ object MetadataGetTablesAction {
     }
 
     def build(): MetadataGetTablesAction = {
-      if (dataSourceName == null) {
+      if (dataSourceName == null && dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
       }
       if (database == null) throw new DataSourceClientBuilderException(DATABASE_NEEDED.getErrorDesc)
@@ -73,6 +99,7 @@ object MetadataGetTablesAction {
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
 
       val metadataGetTablesAction = new MetadataGetTablesAction
+      metadataGetTablesAction.dataSourceId = this.dataSourceId
       metadataGetTablesAction.dataSourceName = this.dataSourceName
       metadataGetTablesAction.database = this.database
       metadataGetTablesAction.setParameter("system", system)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
index bc3c6051ba..f3c64dd2f3 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala
@@ -65,11 +65,12 @@ object PublishDataSourceVersionAction {
     }
 
     def build(): PublishDataSourceVersionAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
-      if (versionId == null)
+      if (versionId == null) {
         throw new DataSourceClientBuilderException(VERSIONID_NEEDED.getErrorDesc)
+      }
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
 
       val action = new PublishDataSourceVersionAction()
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
index 0891fcc05c..c3db731b24 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala
@@ -73,7 +73,7 @@ object UpdateDataSourceAction {
     }
 
     def build(): UpdateDataSourceAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
index 4786acfc1b..cdb2688e21 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala
@@ -73,7 +73,7 @@ object UpdateDataSourceParameterAction {
     }
 
     def build(): UpdateDataSourceParameterAction = {
-      if (dataSourceId == null) {
+      if (dataSourceId <= 0) {
         throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
       }
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
index 334d739ff8..e52bd23b80 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
@@ -26,7 +26,9 @@ import java.util
 
 import scala.beans.BeanProperty
 
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getColumns")
+@DWSHttpMessageResult(
+  "/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getColumns|columns)(\\S+/db/\\S+/table/\\S+)?"
+)
 class MetadataGetColumnsResult extends DWSResult {
   @BeanProperty var columns: util.List[java.util.Map[String, Any]] = _
 
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
index ca65c01fbc..7761d135d6 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
@@ -24,7 +24,7 @@ import java.util
 
 import scala.beans.BeanProperty
 
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getDatabases")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getDatabases|dbs)(\\S+)?")
 class MetadataGetDatabasesResult extends DWSResult {
   @BeanProperty var dbs: util.List[String] = _
 }
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
index f9d62d3c1c..ffb15a8a71 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
@@ -26,7 +26,9 @@ import java.util
 
 import scala.beans.BeanProperty
 
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getPartitions")
+@DWSHttpMessageResult(
+  "/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getPartitions|partitions)(\\S+/db/\\S+/table/\\S+)?"
+)
 class MetadataGetPartitionsResult extends DWSResult {
   @BeanProperty var partitions: util.Map[String, Any] = _
 
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
index 00cd26f66b..ac79a3638b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
@@ -24,7 +24,9 @@ import java.util
 
 import scala.beans.BeanProperty
 
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getTableProp")
+@DWSHttpMessageResult(
+  "/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getTableProp|props)(\\S+/db/\\S+/table/\\S+)?"
+)
 class MetadataGetTablePropsResult extends DWSResult {
   @BeanProperty var props: util.Map[String, String] = _
 }
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
index 4bfb3aa9c4..5396d22ae8 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
@@ -24,7 +24,9 @@ import java.util
 
 import scala.beans.BeanProperty
 
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getTables")
+@DWSHttpMessageResult(
+  "/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getTables|tables)(\\S+/db/\\S+)?"
+)
 class MetadataGetTablesResult extends DWSResult {
   @BeanProperty var tables: util.List[String] = _
 }
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
index 44e95aa71e..8904d3f409 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
@@ -89,10 +89,7 @@
         d.`modify_user`, d.`modify_time`, d.`labels`, d.`version_id`,d.`published_version_id`, d.`expire`
     </sql>
     <sql id="data_source_join_type">
-        t
-        .
-        `name`
-        , t.`icon`,
+        t.`name`, t.`icon`,
         d.`id`, d.`datasource_name`, d.`datasource_type_id`, d.`datasource_desc`,
         d.`create_identify`, d.`create_system`, d.`create_user`, d.`parameter`, d.`create_time`,
         d.`modify_user`, d.`modify_time`, d.`version_id`,d.`published_version_id`, d.`labels`, d.`expire`
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
index 1d8ef5a432..ef8517a69f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
@@ -192,7 +192,7 @@ public Message getPartitions(
       MetaPartitionInfo partitionInfo =
           metadataAppService.getPartitionsByDsId(
               dataSourceId, database, table, system, traverse, userName);
-      return Message.ok().data("props", partitionInfo);
+      return Message.ok().data("partitions", partitionInfo).data("props", partitionInfo);
     } catch (Exception e) {
       return errorToResponseMessage(
           "Fail to get partitions[获取表分区信息失败], id:["