update jdbc

Author: kinsanities

linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala

@@ -310,26 +310,25 @@ class JDBCEngineConnExecutor(override val outputPrintLimit: Int, val id: Int)
         JDBCEngineConnConstant.JDBC_ENGINE_RUN_TIME_DS_PARAM_USERNAME,
         ""
       )
+      val proxyUser: String =
+        globalConfig.getOrDefault(JDBCEngineConnConstant.JDBC_PROXY_USER, execSqlUser)
       logger.info(
-        s"use conn param get dataSourceInfo: executeUser:${execSqlUser} ip:${connHost}, port:${connPort}, dsType:${connDsType}, connUser: ${userName}"
+        s"use conn param get dataSourceInfo: executeUser:${execSqlUser} ip:${connHost}, port:${connPort}, dsType:${connDsType}, createUser:${execSqlUser} connUser: ${proxyUser}"
       )
       if (
           StringUtils.isBlank(connHost) || StringUtils
-            .isBlank(connPort) || StringUtils.isBlank(connDsType) || StringUtils.isBlank(userName)
+            .isBlank(connPort) || StringUtils.isBlank(connDsType) || StringUtils.isBlank(
+            execSqlUser
+          ) || StringUtils.isBlank(proxyUser)
       ) {
         throw new JDBCGetDatasourceInfoException(
           JDBC_GET_DATASOURCEINFO_ERROR.getErrorCode,
           JDBC_GET_DATASOURCEINFO_ERROR.getErrorDesc + " 缺失部分连接参数"
         )
       }
-      if (!execSqlUser.equals(userName)) {
-        throw new JDBCGetDatasourceInfoException(
-          JDBC_GET_DATASOURCEINFO_ERROR.getErrorCode,
-          JDBC_GET_DATASOURCEINFO_ERROR.getErrorDesc + " 执行用户和连接用户不匹配"
-        )
-      }
       dataSourceInfo = JDBCMultiDatasourceParser.queryDatasourceInfoByConnParams(
-        userName,
+        execSqlUser,
+        proxyUser,
         connHost,
         connPort,
         connDsType

linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala

@@ -293,15 +293,17 @@ object JDBCMultiDatasourceParser extends Logging {
   }
 
   def queryDatasourceInfoByConnParams(
-      userName: String,
+      createUser: String,
+      proxyUser: String,
       ip: String,
       port: String,
       datasourceTypeName: String
   ): util.Map[String, String] = {
     val dataSourceClient = new LinkisDataSourceRemoteClient()
     val action: GetInfoPublishedByUserIpPortAction = GetInfoPublishedByUserIpPortAction.builder
       .setDatasourceTypeName(datasourceTypeName)
-      .setUser(userName)
+      .setUser(createUser)
+      .setDatasourceUser(proxyUser)
       .setIp(ip)
       .setPort(port)
       .build // ignore parameter 'system'

linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByUserIpPortAction.scala

@@ -62,6 +62,7 @@ object GetInfoPublishedByUserIpPortAction {
       this.datasourceUser = datasourceUser
       this
     }
+
     def setOwner(owner: String): Builder = {
       this.owner = owner
       this
@@ -103,7 +104,8 @@ object GetInfoPublishedByUserIpPortAction {
 //      if (system == null) throw new DataSourceClientBuilderException(SYSTEM_NEEDED.getErrorDesc)
       if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
 
-      if (datasourceUser == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
+      if (datasourceUser == null)
+        throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
 
       val GetInfoPublishedByUserIpPortAction = new GetInfoPublishedByUserIpPortAction
       GetInfoPublishedByUserIpPortAction.datasourceTypeName = this.datasourceTypeName