From 1cbd17f0c81bd636b380f1a37e06aeb879b77a97 Mon Sep 17 00:00:00 2001
From: sjgllgh <129264181+sjgllgh@users.noreply.github.com>
Date: Tue, 25 Jul 2023 10:50:10 +0800
Subject: [PATCH] Fix pg bug (#4807)

* fix missing backtick in mysql keywords

* fix pg bug
---
 .../EngineConnBmlResourceMapper.xml           |   0
 .../EngineConnBmlResourceMapper.xml           |  93 ++++++
 .../postgresql/ECResourceRecordMapper.xml     |   2 +-
 .../DatasourceAccessMapper.xml                |   0
 .../{common => mysql}/DatasourceEnvMapper.xml |   0
 .../GatewayAuthTokenMapper.xml                |   0
 .../RmExternalResourceProviderMapper.xml      |   0
 .../{common => mysql}/UdfManagerMapper.xml    |   0
 .../{common => mysql}/UdfTreeMapper.xml       |   0
 .../postgresql/DatasourceAccessMapper.xml     |  49 ++++
 .../mapper/postgresql/DatasourceEnvMapper.xml |  51 ++++
 .../postgresql/DatasourceTypeKeyMapper.xml    |   2 +-
 .../postgresql/DatasourceTypeMapper.xml       |   8 +-
 .../postgresql/GatewayAuthTokenMapper.xml     |  51 ++++
 .../mapper/postgresql/PsErrorCodeMapper.xml   |   8 +-
 .../RmExternalResourceProviderMapper.xml      |  47 +++
 .../mapper/postgresql/UdfManagerMapper.xml    |  40 +++
 .../mapper/postgresql/UdfTreeMapper.xml       |  51 ++++
 .../mapper/postgresql/contextMapMapper.xml    |   6 +-
 .../{common => mysql}/DataSouceMapper.xml     |   0
 .../{common => mysql}/DataSourceEnvMapper.xml |   0
 .../mapper/postgresql/DataSouceMapper.xml     | 270 ++++++++++++++++++
 .../mapper/postgresql/DataSourceEnvMapper.xml | 136 +++++++++
 .../mapper/postgresql/JobHistoryMapper.xml    |   4 +-
 .../resources/mapper/postgresql/UDFDao.xml    |   4 +-
 25 files changed, 805 insertions(+), 17 deletions(-)
 rename linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/{common => mysql}/EngineConnBmlResourceMapper.xml (100%)
 create mode 100644 linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/postgresql/EngineConnBmlResourceMapper.xml
 rename linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/{common => mysql}/DatasourceAccessMapper.xml (100%)
 rename linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/{common => mysql}/DatasourceEnvMapper.xml (100%)
 rename linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/{common => mysql}/GatewayAuthTokenMapper.xml (100%)
 rename linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/{common => mysql}/RmExternalResourceProviderMapper.xml (100%)
 rename linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/{common => mysql}/UdfManagerMapper.xml (100%)
 rename linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/{common => mysql}/UdfTreeMapper.xml (100%)
 create mode 100644 linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
 create mode 100644 linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
 create mode 100644 linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
 create mode 100644 linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
 create mode 100644 linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
 create mode 100644 linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
 rename linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/{common => mysql}/DataSouceMapper.xml (100%)
 rename linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/{common => mysql}/DataSourceEnvMapper.xml (100%)
 create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSouceMapper.xml
 create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSourceEnvMapper.xml

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/mysql/EngineConnBmlResourceMapper.xml
similarity index 100%
rename from linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
rename to linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/mysql/EngineConnBmlResourceMapper.xml
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/postgresql/EngineConnBmlResourceMapper.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/postgresql/EngineConnBmlResourceMapper.xml
new file mode 100644
index 0000000000..acea50c6fa
--- /dev/null
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/postgresql/EngineConnBmlResourceMapper.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="org.apache.linkis.engineplugin.server.dao.EngineConnBmlResourceDao">
+
+
+    <sql id="bml_resources">
+        engine_conn_type,version,file_name,file_size,last_modified,bml_resource_id,bml_resource_version,create_time,last_update_time
+    </sql>
+
+    <select id="getAllEngineConnBmlResource"
+            resultType="org.apache.linkis.engineplugin.server.entity.EngineConnBmlResource">
+        SELECT * FROM linkis_cg_engine_conn_plugin_bml_resources
+        WHERE engine_conn_type=#{engineConnType} and version=#{version}
+    </select>
+
+    <select id="getTypeVersionList" resultType="java.lang.String">
+        SELECT version FROM linkis_cg_engine_conn_plugin_bml_resources where engine_conn_type = #{type} GROUP BY version
+    </select>
+
+    <select id="getTypeList" resultType="java.lang.String">
+        SELECT engine_conn_type FROM linkis_cg_engine_conn_plugin_bml_resources GROUP BY engine_conn_type
+    </select>
+
+    <select id="selectByPageVo"
+            resultType="org.apache.linkis.engineplugin.server.entity.EngineConnBmlResource">
+        SELECT
+        *
+        FROM linkis_cg_engine_conn_plugin_bml_resources
+        <where>
+            <if test="engineConnType != null and engineConnType != ''">
+                AND engine_conn_type like concat('%', #{engineConnType}::text, '%')
+            </if>
+            <if test="engineConnVersion != null and engineConnVersion != ''">
+                AND version like concat('%', #{engineConnVersion}::text, '%')
+            </if>
+        </where>
+         ORDER BY create_time DESC
+    </select>
+
+    <delete id="delete" parameterType="org.apache.linkis.engineplugin.server.entity.EngineConnBmlResource">
+        DELETE FROM linkis_cg_engine_conn_plugin_bml_resources
+        WHERE engine_conn_type = #{engineConnBmlResource.engineConnType}
+        AND version = #{engineConnBmlResource.version}
+        AND file_name = #{engineConnBmlResource.fileName}
+    </delete>
+
+    <update id="update" parameterType="org.apache.linkis.engineplugin.server.entity.EngineConnBmlResource">
+        UPDATE linkis_cg_engine_conn_plugin_bml_resources
+        <set>
+            <if test="engineConnBmlResource.lastModified != null">last_modified =
+                #{engineConnBmlResource.lastModified},
+            </if>
+            <if test="engineConnBmlResource.fileSize != null">file_size = #{engineConnBmlResource.fileSize},</if>
+            <if test="engineConnBmlResource.bmlResourceVersion != null">bml_resource_version =
+                #{engineConnBmlResource.bmlResourceVersion},
+            </if>
+            <if test="engineConnBmlResource.lastUpdateTime != null">last_update_time =
+                #{engineConnBmlResource.lastUpdateTime},
+            </if>
+        </set>
+        WHERE engine_conn_type=#{engineConnBmlResource.engineConnType} and version=#{engineConnBmlResource.version}
+        AND file_name=#{engineConnBmlResource.fileName}
+    </update>
+
+    <insert id="save" parameterType="org.apache.linkis.engineplugin.server.entity.EngineConnBmlResource">
+        INSERT INTO linkis_cg_engine_conn_plugin_bml_resources(<include refid="bml_resources"/>)
+        VALUES (#{engineConnBmlResource.engineConnType}, #{engineConnBmlResource.version},
+        #{engineConnBmlResource.fileName},#{engineConnBmlResource.fileSize},
+        #{engineConnBmlResource.lastModified},#{engineConnBmlResource.bmlResourceId},
+        #{engineConnBmlResource.bmlResourceVersion},
+        #{engineConnBmlResource.createTime}, #{engineConnBmlResource.lastUpdateTime})
+    </insert>
+
+
+</mapper>
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml
index 8bc13d23f0..fdac449757 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml
@@ -87,7 +87,7 @@
             <if test="instance != null">service_instance = #{instance}</if>
             <if test="username != null">and create_user = #{username}</if>
             <!--            label_value in db eg：`hadoop-spark,spark-3.2.1`-->
-            <if test="engineType !=null">and label_value like concat('%,',#{engineType},'%')</if>
+            <if test="engineType !=null">and label_value like concat('%,',#{engineType}::text,'%')</if>
             <if test="startDate != null">and create_time BETWEEN #{startDate} AND #{endDate}</if>
         </where>
         ORDER BY linkis_cg_ec_resource_info_record.create_time DESC
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfManagerMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfManagerMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfTreeMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
rename to linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfTreeMapper.xml
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
new file mode 100644
index 0000000000..14a96f82b7
--- /dev/null
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="org.apache.linkis.basedatamanager.server.dao.DatasourceAccessMapper">
+
+    <resultMap id="BaseResultMap" type="org.apache.linkis.basedatamanager.server.domain.DatasourceAccessEntity">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="tableId" column="table_id" jdbcType="BIGINT"/>
+            <result property="visitor" column="visitor" jdbcType="VARCHAR"/>
+            <result property="fields" column="fields" jdbcType="VARCHAR"/>
+            <result property="applicationId" column="application_id" jdbcType="INTEGER"/>
+            <result property="accessTime" column="access_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,table_id,visitor,
+        fields,application_id,access_time
+    </sql>
+
+    <select id="getListByPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM linkis_ps_datasource_access
+        <if test="searchName != null and searchName!=''">
+            WHERE visitor LIKE concat('%',#{searchName}::text,'%')
+            OR fields LIKE concat('%',#{searchName}::text,'%')
+        </if>
+    </select>
+</mapper>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
new file mode 100644
index 0000000000..ecff962236
--- /dev/null
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.linkis.basedatamanager.server.dao.DatasourceEnvMapper">
+
+    <resultMap id="BaseResultMap" type="org.apache.linkis.basedatamanager.server.domain.DatasourceEnvEntity">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="envName" column="env_name" jdbcType="VARCHAR"/>
+            <result property="envDesc" column="env_desc" jdbcType="VARCHAR"/>
+            <result property="datasourceTypeId" column="datasource_type_id" jdbcType="INTEGER"/>
+            <result property="parameter" column="parameter" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="modifyTime" column="modify_time" jdbcType="TIMESTAMP"/>
+            <result property="modifyUser" column="modify_user" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,env_name,env_desc,
+        datasource_type_id,parameter,create_time,
+        create_user,modify_time,modify_user
+    </sql>
+
+    <select id="getListByPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM linkis_ps_dm_datasource_env
+        <if test="searchName != null and searchName!=''">
+            WHERE env_name LIKE concat('%',#{searchName}::text,'%')
+            OR env_desc LIKE concat('%',#{searchName}::text,'%')
+            OR parameter LIKE concat('%',#{searchName}::text,'%')
+        </if>
+    </select>
+</mapper>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
index 0ee9730c65..4793556646 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
@@ -55,7 +55,7 @@
          from linkis_ps_dm_datasource_type_key
         where 1 = 1
         <if test="searchName != null and searchName!=''">
-            and "name" like concat('%',#{searchName},'%')
+            and "name" like concat('%',#{searchName}::text,'%')
         </if>
         <if test="dataSourceTypeId != null and dataSourceTypeId!=''">
             and "data_source_type_id" = #{dataSourceTypeId}
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
index 01f38cc543..3aa09d5e68 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
@@ -41,10 +41,10 @@
         <include refid="Base_Column_List"></include>
          from linkis_ps_dm_datasource_type
         <if test="searchName != null and searchName!=''">
-              WHERE "name" LIKE concat('%',#{searchName},'%')
-            OR "description" LIKE concat('%',#{searchName},'%')
-            OR "option" LIKE concat('%',#{searchName},'%')
-            OR "classifier" LIKE concat('%',#{searchName},'%')
+              WHERE "name" LIKE concat('%',#{searchName}::text,'%')
+            OR "description" LIKE concat('%',#{searchName}::text,'%')
+            OR "option" LIKE concat('%',#{searchName}::text,'%')
+            OR "classifier" LIKE concat('%',#{searchName}::text,'%')
         </if>
     </select>
 </mapper>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
new file mode 100644
index 0000000000..80051880b4
--- /dev/null
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.linkis.basedatamanager.server.dao.GatewayAuthTokenMapper">
+
+    <resultMap id="BaseResultMap" type="org.apache.linkis.basedatamanager.server.domain.GatewayAuthTokenEntity">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="tokenName" column="token_name" jdbcType="VARCHAR"/>
+            <result property="legalUsers" column="legal_users" jdbcType="VARCHAR"/>
+            <result property="legalHosts" column="legal_hosts" jdbcType="VARCHAR"/>
+            <result property="businessOwner" column="business_owner" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="DATE"/>
+            <result property="updateTime" column="update_time" jdbcType="DATE"/>
+            <result property="elapseDay" column="elapse_day" jdbcType="BIGINT"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,token_name,legal_users,
+        legal_hosts,business_owner,create_time,
+        update_time,elapse_day,update_by
+    </sql>
+
+    <select id="getListByPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM linkis_mg_gateway_auth_token
+        <if test="searchName != null and searchName!=''">
+            WHERE token_name LIKE concat('%',#{searchName}::text,'%')
+            OR legal_users LIKE concat('%',#{searchName}::text,'%')
+            OR legal_hosts LIKE concat('%',#{searchName}::text,'%')
+        </if>
+    </select>
+</mapper>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
index cec7c7e9ff..a0088e7d0e 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
@@ -38,10 +38,10 @@
         <include refid="Base_Column_List"></include>
         from linkis_ps_error_code
         <if test="searchName != null and searchName!=''">
-            where error_code like concat('%',#{searchName},'%')
-            or error_desc like concat('%',#{searchName},'%')
-            or error_regex like concat('%',#{searchName},'%')
-            or error_type::text like concat('%',#{searchName},'%')
+            where error_code like concat('%',#{searchName}::text,'%')
+            or error_desc like concat('%',#{searchName}::text,'%')
+            or error_regex like concat('%',#{searchName}::text,'%')
+            or error_type::text like concat('%',#{searchName}::text,'%')
         </if>
     </select>
 </mapper>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
new file mode 100644
index 0000000000..b27c8dcd9f
--- /dev/null
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.linkis.basedatamanager.server.dao.RmExternalResourceProviderMapper">
+
+    <resultMap id="BaseResultMap" type="org.apache.linkis.basedatamanager.server.domain.RmExternalResourceProviderEntity">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="resourceType" column="resource_type" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="labels" column="labels" jdbcType="VARCHAR"/>
+            <result property="config" column="config" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,resource_type,name,
+        labels,config
+    </sql>
+
+    <select id="getListByPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM linkis_cg_rm_external_resource_provider
+        <if test="searchName != null and searchName!=''">
+            WHERE resource_type LIKE concat('%',#{searchName}::text,'%')
+            OR name LIKE concat('%',#{searchName}::text,'%')
+            OR labels LIKE concat('%',#{searchName}::text,'%')
+            OR config LIKE concat('%',#{searchName}::text,'%')
+        </if>
+    </select>
+</mapper>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
new file mode 100644
index 0000000000..799243f9fb
--- /dev/null
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.linkis.basedatamanager.server.dao.UdfManagerMapper">
+
+    <resultMap id="BaseResultMap" type="org.apache.linkis.basedatamanager.server.domain.UdfManagerEntity">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_name
+    </sql>
+
+    <select id="getListByPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM linkis_ps_udf_manager
+        <if test="searchName != null and searchName!=''">
+            WHERE user_name LIKE concat('%',#{searchName}::text,'%')
+        </if>
+    </select>
+</mapper>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
new file mode 100644
index 0000000000..0a8422afe1
--- /dev/null
+++ b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.linkis.basedatamanager.server.dao.UdfTreeMapper">
+
+    <resultMap id="BaseResultMap" type="org.apache.linkis.basedatamanager.server.domain.UdfTreeEntity">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="parent" column="parent" jdbcType="BIGINT"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+            <result property="description" column="description" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="category" column="category" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,parent,name,
+        user_name,description,create_time,
+        update_time,category
+    </sql>
+
+    <select id="getListByPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM linkis_ps_udf_tree
+        <if test="searchName != null and searchName!=''">
+            WHERE user_name LIKE concat('%',#{searchName}::text,'%')
+            OR name LIKE concat('%',#{searchName}::text,'%')
+            OR description LIKE concat('%',#{searchName}::text,'%')
+            OR category LIKE concat('%',#{searchName}::text,'%')
+        </if>
+    </select>
+</mapper>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
index f1c9794f60..d59e858250 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
@@ -64,7 +64,7 @@
     </select>
 
     <select id="getAllContextMapByKey" resultMap="PersistenceContextKeyValue">
-        SELECT * FROM linkis_ps_cs_context_map WHERE context_id = cast(#{contextID.contextId} as int) AND "key" LIKE CONCAT('%',#{key},'%')
+        SELECT * FROM linkis_ps_cs_context_map WHERE context_id = cast(#{contextID.contextId} as int) AND "key" LIKE CONCAT('%',#{key}::text,'%')
     </select>
 
 
@@ -120,7 +120,7 @@
         <where>
             <if test="#{contextID.contextId} !=null">context_id = cast(#{contextID.contextId} as int) and </if>
             <!--<if test="#{contextType} !=null">context_type = #{contextType} and </if>-->
-            <if test="#{keyPrefix} !=null">"key" like concat(#{keyPrefix},'%')</if>
+            <if test="#{keyPrefix} !=null">"key" like concat(#{keyPrefix}::text,'%')</if>
         </where>
     </delete>
     <!--todo 和上面的合并sql-->
@@ -129,7 +129,7 @@
         <where>
             <if test="#{contextID.contextId} !=null">context_id = cast(#{contextID.contextId} as int) and </if>
             <if test="#{contextType} !=null">context_type = #{contextType} and </if>
-            <if test="#{keyPrefix} !=null">"key" like concat(#{keyPrefix},'%')</if>
+            <if test="#{keyPrefix} !=null">"key" like concat(#{keyPrefix}::text,'%')</if>
         </where>
     </delete>
 
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/mysql/DataSouceMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/mysql/DataSouceMapper.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/mysql/DataSourceEnvMapper.xml
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/mysql/DataSourceEnvMapper.xml
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSouceMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSouceMapper.xml
new file mode 100644
index 0000000000..88bd3c51bf
--- /dev/null
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSouceMapper.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~ 
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~ 
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+  
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="org.apache.linkis.datasourcemanager.core.dao.DataSourceDao">
+    <resultMap id="dataSourceDetailMap" type="org.apache.linkis.datasourcemanager.common.domain.DataSource">
+        <result property="id" column="id"/>
+        <result property="dataSourceName" column="datasource_name"/>
+        <result property="dataSourceDesc" column="datasource_desc"/>
+        <result property="dataSourceTypeId" column="datasource_type_id"/>
+        <result property="createIdentify" column="create_identify"/>
+        <result property="createSystem" column="create_system"/>
+        <result property="parameter" column="parameter"/>
+        <result property="expire" column="expire"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="modifyUser" column="modify_user"/>
+        <result property="createUser" column="create_user"/>
+        <result property="versionId" column="version_id"/>
+        <result property="publishedVersionId" column="published_version_id"/>
+        <result property="labels" column="labels"/>
+        <association property="dataSourceType" javaType="org.apache.linkis.datasourcemanager.common.domain.DataSourceType">
+            <result property="icon" column="icon"/>
+            <result property="name" column="name"/>
+        </association>
+        <association property="dataSourceEnv" javaType="org.apache.linkis.datasourcemanager.common.domain.DataSourceEnv" column="datasource_env_id"
+                     select="selectEnvById">
+            <result property="envName" column="env_name"/>
+            <result property="parameter" column="env_parameter"/>
+        </association>
+    </resultMap>
+
+    <resultMap id="dataSourceMap" type="org.apache.linkis.datasourcemanager.common.domain.DataSource">
+        <result property="id" column="id"/>
+        <result property="dataSourceName" column="datasource_name"/>
+        <result property="dataSourceDesc" column="datasource_desc"/>
+        <result property="dataSourceTypeId" column="datasource_type_id"/>
+        <result property="createIdentify" column="create_identify"/>
+        <result property="versionId" column="version_id"/>
+        <result property="publishedVersionId" column="published_version_id"/>
+        <result property="createSystem" column="create_system"/>
+        <result property="parameter" column="parameter"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="modifyUser" column="modify_user"/>
+        <result property="createUser" column="create_user"/>
+        <result property="labels" column="labels"/>
+        <result property="expire" column="expire"/>
+        <association property="dataSourceType" javaType="org.apache.linkis.datasourcemanager.common.domain.DataSourceType">
+            <result property="id" column="id"/>
+            <result property="name" column="name"/>
+        </association>
+    </resultMap>
+
+    <sql id="data_source_insert_columns">
+        datasource_name
+        , datasource_type_id, datasource_desc,
+        create_identify, create_system, create_user, parameter, create_time,
+        modify_user, modify_time, labels
+    </sql>
+
+    <sql id="data_source_query_columns">
+        id
+        , datasource_name, datasource_type_id, datasource_desc,
+        create_identify, create_system, create_user, parameter, expire, create_time,
+        modify_user, modify_time
+    </sql>
+
+    <sql id="data_source_query_page">
+        d.id
+        , d.datasource_name, d.datasource_type_id, t.name, d.datasource_desc,
+        d.create_identify, d.create_system, d.create_user, d.create_time,
+        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,
+        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
+    </sql>
+
+    <insert id="insertOne" useGeneratedKeys="true" keyProperty="id" parameterType="org.apache.linkis.datasourcemanager.common.domain.DataSource">
+        INSERT INTO linkis_ps_dm_datasource(
+        <include refid="data_source_insert_columns"/>
+        ) VALUES(#{dataSourceName}, #{dataSourceTypeId},
+        #{dataSourceDesc,jdbcType=VARCHAR}, #{createIdentify}, #{createSystem}, #{createUser},
+        #{parameter},
+        <choose>
+            <when test="createTime == null">
+                now(),
+            </when>
+            <otherwise>
+                #{createTime,jdbcType=TIMESTAMP},
+            </otherwise>
+        </choose>
+
+        #{modifyUser,jdbcType=VARCHAR},
+
+        <choose>
+            <when test="modifyTime == null">
+                now(),
+            </when>
+            <otherwise>
+                #{modifyTime,jdbcType=TIMESTAMP},
+            </otherwise>
+        </choose>
+
+        #{labels})
+    </insert>
+
+    <select id="selectOneDetail" resultMap="dataSourceDetailMap">
+        SELECT
+        <include refid="data_source_join_type"/>
+         FROM linkis_ps_dm_datasource_type t
+        INNER JOIN linkis_ps_dm_datasource d ON t.id = d.datasource_type_id
+        <where>
+            d.id = #{dataSourceId}
+        </where>
+    </select>
+
+    <select id="selectOneDetailByName" resultMap="dataSourceDetailMap">
+        SELECT
+        <include refid="data_source_join_type"/>
+         FROM linkis_ps_dm_datasource_type t
+        INNER JOIN linkis_ps_dm_datasource d ON t.id = d.datasource_type_id
+        <where>
+            d.datasource_name = #{dataSourceName} LIMIT 1
+        </where>
+    </select>
+    <select id="selectOne" resultMap="dataSourceMap">
+        SELECT
+        <include refid="data_source_query_columns"/>
+         FROM linkis_ps_dm_datasource
+        <where>
+            id = #{dataSourceId}
+        </where>
+    </select>
+
+    <select id="selectOneByName" resultMap="dataSourceMap">
+        SELECT
+        <include refid="data_source_query_columns"/>
+         FROM linkis_ps_dm_datasource
+        <where>
+            datasource_name = #{dataSourceName}
+        </where>
+         LIMIT 1;
+    </select>
+    <select id="selectEnvById" resultType="DataSourceEnv">
+
+        SELECT env_name, parameter AS env_parameter
+        FROM linkis_ps_dm_datasource_env
+        WHERE id = #{id};
+
+    </select>
+
+    <delete id="removeOne">
+        DELETE FROM linkis_ps_dm_datasource
+        <where>
+            id = #{dataSourceId}
+        </where>
+    </delete>
+
+    <update id="updateOne">
+        UPDATE linkis_ps_dm_datasource
+        <set>
+            datasource_name = #{dataSourceName},
+            datasource_desc = #{dataSourceDesc,jdbcType=VARCHAR},
+            <if test="dataSourceTypeId != null and dataSourceTypeId > 0">
+                datasource_type_id = #{dataSourceTypeId},
+            </if>
+            parameter = #{parameter},
+            create_identify = #{createIdentify,jdbcType=VARCHAR},
+            create_system = #{createSystem,jdbcType=VARCHAR},
+            <choose>
+                <when test="modifyTime == null">
+                    modify_time = now(),
+                </when>
+                <otherwise>
+                    modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+                </otherwise>
+            </choose>
+            modify_user = #{modifyUser,jdbcType=VARCHAR},
+            labels = #{labels,jdbcType=VARCHAR}
+        </set>
+        <where>
+            id = #{id}
+        </where>
+    </update>
+
+    <update id="expireOne">
+        UPDATE linkis_ps_dm_datasource
+        <set>
+            expire = true
+        </set>
+        <where>
+            id = #{dataSourceId}
+        </where>
+    </update>
+
+    <select id="selectByIds" resultMap="dataSourceMap">
+        SELECT
+        <include refid="data_source_query_page"/>
+         FROM linkis_ps_dm_datasource_type t
+        INNER JOIN linkis_ps_dm_datasource d ON t.id = d.datasource_type_id
+        <where>
+            <if test="ids != null and ids.size > 0">
+                AND d.id in
+                <foreach collection="ids" index="index" item="id" separator="," open="(" close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+         ORDER BY create_time DESC
+    </select>
+
+    <select id="selectByPageVo" resultMap="dataSourceMap">
+        SELECT
+        <include refid="data_source_query_page"/>
+         FROM linkis_ps_dm_datasource_type t
+    INNER JOIN linkis_ps_dm_datasource d ON t.id = d.datasource_type_id
+        <where>
+            <if test="dataSourceName != null and dataSourceName != ''">
+                AND datasource_name like concat('%', #{dataSourceName}::text, '%')
+            </if>
+            <if test="dataSourceTypeId != null and dataSourceTypeId > 0">
+                AND datasource_type_id = #{dataSourceTypeId}
+            </if>
+            <if test="permissionUser != null and permissionUser != ''">
+                AND create_user = #{permissionUser}
+            </if>
+        </where>
+         ORDER BY create_time DESC
+    </select>
+
+    <update id="setPublishedVersionId">
+        UPDATE linkis_ps_dm_datasource
+        <set>
+            published_version_id = #{versionId}
+        </set>
+        <where>
+            id = #{dataSourceId}
+        </where>
+    </update>
+
+    <update id="updateVersionId">
+        UPDATE linkis_ps_dm_datasource
+        <set>
+            version_id = #{versionId}
+        </set>
+        <where>
+            id = #{dataSourceId}
+        </where>
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSourceEnvMapper.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSourceEnvMapper.xml
new file mode 100644
index 0000000000..3c02c7dfed
--- /dev/null
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSourceEnvMapper.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~ 
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~ 
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+  
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="org.apache.linkis.datasourcemanager.core.dao.DataSourceEnvDao">
+    <resultMap id="dataSourceEnvMap" type="org.apache.linkis.datasourcemanager.common.domain.DataSourceEnv">
+        <result property="id" column="id"/>
+        <result property="envName" column="env_name"/>
+        <result property="envDesc" column="env_desc"/>
+        <result property="parameter" column="parameter"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createUser" column="create_user"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="modifyUser" column="modify_user"/>
+        <result property="dataSourceTypeId" column="datasource_type_id"/>
+        <association property="dataSourceType" javaType="org.apache.linkis.datasourcemanager.common.domain.DataSourceType">
+            <result property="icon" column="icon"/>
+            <result property="name" column="name"/>
+        </association>
+    </resultMap>
+
+    <sql id="data_source_env_insert_columns">
+        env_name, env_desc, datasource_type_id ,parameter, create_time,
+        create_user, modify_time, modify_user
+    </sql>
+
+    <sql id="data_source_env_detail">
+        id, env_name, env_desc, parameter, create_time,
+        create_user, modify_time, modify_user
+    </sql>
+
+    <select id="selectOneDetail" resultMap="dataSourceEnvMap">
+        SELECT e.id, e.env_name, e.env_desc, e.parameter, e.create_time,
+        e.create_user, e.modify_time, e.modify_user
+            FROM linkis_ps_dm_datasource_env e WHERE id = #{dataSourceEnvId};
+    </select>
+
+    <insert id="insertOne" useGeneratedKeys="true" keyProperty="id" parameterType="org.apache.linkis.datasourcemanager.common.domain.DataSourceType">
+        INSERT INTO linkis_ps_dm_datasource_env(
+        <include refid="data_source_env_insert_columns"/>
+        ) VALUES(#{envName}, #{envDesc},#{dataSourceTypeId},
+        #{parameter},
+
+        <choose>
+            <when test="createTime == null">
+                now(),
+            </when>
+            <otherwise>
+                #{createTime,jdbcType=TIMESTAMP},
+            </otherwise>
+        </choose>
+
+        #{createUser},
+
+        <choose>
+            <when test="modifyTime == null">
+                now(),
+            </when>
+            <otherwise>
+                #{modifyTime,jdbcType=TIMESTAMP},
+            </otherwise>
+        </choose>
+        #{modifyUser})
+    </insert>
+
+    <select id="listByTypeId" resultMap="dataSourceEnvMap">
+        SELECT id, env_name FROM linkis_ps_dm_datasource_env
+        WHERE datasource_type_id = #{id}
+    </select>
+
+    <select id="selectByPageVo" resultMap="dataSourceEnvMap">
+        SELECT e.id, e.env_name, e.env_desc, e.parameter, e.create_time,
+        e.create_user, e.modify_time, e.modify_user, e.datasource_type_id
+            FROM linkis_ps_dm_datasource_env e
+        <where>
+            <if test="envName != null and envName != ''">
+                e.env_name like concat('%', #{envName}::text, '%')
+            </if>
+            <if test="dataSourceTypeId != null and dataSourceTypeId > 0">
+                AND e.datasource_type_id = #{dataSourceTypeId}
+            </if>
+        </where>
+    </select>
+
+    <delete id="removeOne">
+        DELETE FROM linkis_ps_dm_datasource_env WHERE id = #{id};
+    </delete>
+
+    <update id="updateOne">
+        UPDATE linkis_ps_dm_datasource_env
+        <set>
+            env_name = #{envName},
+            env_desc = #{envDesc,jdbcType=VARCHAR},
+            parameter = #{parameter},
+<!--            modify_time = #{modifyTime,jdbcType=TIMESTAMP},-->
+            <choose>
+                <when test="modifyTime == null">
+                    modify_time = now(),
+                </when>
+                <otherwise>
+                    modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+                </otherwise>
+            </choose>
+            modify_user = #{modifyUser,jdbcType=VARCHAR}
+        </set>
+        <where>
+            id = #{id}
+        </where>
+    </update>
+
+    <select id="selectOneByName" resultMap="dataSourceEnvMap">
+        SELECT
+        <include refid="data_source_env_detail"/>
+         FROM linkis_ps_dm_datasource_env
+        <where>
+            env_name = #{envName}
+        </where>
+         LIMIT 1;
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
index cd4c3e056c..30e4e85b34 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
@@ -133,7 +133,7 @@
             <if test="startDate != null">and created_time >= #{startDate} AND created_time <![CDATA[<=]]> #{endDate}</if>
             <if test="status != null">and <foreach collection="status" item="element" close=")" separator="," open="status in (">#{element}</foreach></if>
             <if test="userCreatorKey != null and creator != null">
-                and labels like CONCAT('%"', #{userCreatorKey}, '":"%-', #{creator}, '%')
+                and labels like CONCAT('%"', #{userCreatorKey}::text, '":"%-', #{creator}::text, '%')
             </if>
             <if test="startId != null">and id >= #{startId}</if>
             <if test="instances != null">and instances = #{instances}</if>
@@ -213,7 +213,7 @@
             <if test="startDate != null">and created_time >= #{startDate} AND created_time <![CDATA[<=]]> #{endDate}</if>
             <if test="status != null">and <foreach collection="status" item="element" close=")" separator="," open="status in (">#{element}</foreach></if>
             <if test="userCreatorKey != null and creator != null">
-                and labels like CONCAT('%"', #{userCreatorKey}, '":"%-', #{creator}, '%')
+                and labels like CONCAT('%"', #{userCreatorKey}::text, '":"%-', #{creator}::text, '%')
             </if>
         </where>
     </select>
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
index f4e6eca73c..b32b421850 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
@@ -227,7 +227,7 @@
         linkis_ps_udf_baseinfo b
         on a.udf_id=b.id
         where udf_type=0
-        and b.path like CONCAT('%',#{arg1})
+        and b.path like CONCAT('%',#{arg1}::text)
     </select>
 
     <select id="getSameNameCountByUser" resultType="java.lang.Long" >
@@ -344,7 +344,7 @@
         <where>
             <if test="1 == 1">1 = 1</if>
             <if test="createUser != null">and pu.create_user = #{createUser}</if>
-            <if test="udfName != null">and pu.udf_name like CONCAT('%',#{udfName},'%')</if>
+            <if test="udfName != null">and pu.udf_name like CONCAT('%',#{udfName}::text,'%')</if>
             <if test="udfTypes != null">and pu.udf_type in
                 <foreach collection="udfTypes" open="(" close=")" item="item" separator=",">
                     #{item}