diff --git a/dolphinscheduler-common/sql/soft_version b/dolphinscheduler-common/sql/soft_version
new file mode 100644
index 000000000000..5409e995b5b6
--- /dev/null
+++ b/dolphinscheduler-common/sql/soft_version
@@ -0,0 +1 @@
+32432423
\ No newline at end of file
diff --git a/dolphinscheduler-common/test/testFile.txt b/dolphinscheduler-common/test/testFile.txt
new file mode 100644
index 000000000000..be188e1611ec
--- /dev/null
+++ b/dolphinscheduler-common/test/testFile.txt
@@ -0,0 +1 @@
+正正正faffdasfasdfas
\ No newline at end of file
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml
index 02fc9526b346..44053bdf171d 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.xml
@@ -22,13 +22,14 @@
         select t.id, t.user_id, t.token, t.expire_time, t.create_time, t.update_time, u.user_name
         from t_ds_access_token t
         left join t_ds_user u on t.user_id = u.id
-        where 1 = 1
-        <if test="userName != null and userName != ''">
-            and u.user_name like concat ('%', #{userName}, '%')
-        </if>
-        <if test="userId != 0">
-            and t.user_id = #{userId}
-        </if>
+        <where>
+            <if test="userName != null and userName != ''">
+              u.user_name like concat ('%', #{userName}, '%')
+            </if>
+            <if test="userId != 0">
+                and t.user_id = #{userId}
+            </if>
+        </where>
         order by t.update_time desc
     </select>
 </mapper>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
index 90fd8a72a74c..954f01120faa 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
@@ -26,10 +26,11 @@
         select
         <include refid="baseSql"/>
         from t_ds_alertgroup
-        where 1 = 1
-        <if test="groupName != null and groupName != ''">
-            and group_name like concat('%', #{groupName}, '%')
-        </if>
+        <where>
+            <if test="groupName != null and groupName != ''">
+                 group_name like concat('%', #{groupName}, '%')
+            </if>
+        </where>
         order by update_time desc
     </select>
     <select id="queryByGroupName" resultType="org.apache.dolphinscheduler.dao.entity.AlertGroup">
@@ -63,4 +64,4 @@
         select alert_instance_ids  from t_ds_alertgroup
         where id = #{alertGroupId}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
index 337c41e4b20d..1e3388474364 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.xml
@@ -45,20 +45,22 @@
         u.user_name as user_name
         from t_ds_datasource d
         join t_ds_user u on d.user_id = u.id
-        where 1 =1
-        <if test="userId != 0">
-            and d.id in
-            (select datasource_id
-            from t_ds_relation_datasource_user
-            where user_id=#{userId}
-            union select id as datasource_id
-            from t_ds_datasource
-            where user_id=#{userId}
-            )
-        </if>
-        <if test="name != null and name != ''">
-            and name like concat ('%', #{name}, '%')
-        </if>
+        <where>
+            <if test="userId != 0">
+             d.id in
+                (select datasource_id
+                from t_ds_relation_datasource_user
+                where user_id=#{userId}
+                union select id as datasource_id
+                from t_ds_datasource
+                where user_id=#{userId}
+                )
+            </if>
+            <if test="name != null and name != ''">
+                and name like concat ('%', #{name}, '%')
+            </if>
+        </where>
+
         order by update_time desc
     </select>
     <select id="queryDataSourceByName" resultType="org.apache.dolphinscheduler.dao.entity.DataSource">
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
index f66163541b3c..c253e829d1f8 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
@@ -35,14 +35,15 @@
         select
         <include refid="baseSql"/>
         from t_ds_process_instance
-        where 1=1
-        <if test="host != null and host != ''">
-            and host=#{host}
-        </if>
-        and state in
-        <foreach collection="states" item="i" open="(" close=")" separator=",">
-            #{i}
-        </foreach>
+        <where>
+            <if test="host != null and host != ''">
+                host=#{host}
+            </if>
+            and state in
+            <foreach collection="states" item="i" open="(" close=")" separator=",">
+                #{i}
+            </foreach>
+        </where>
         order by id asc
     </select>
 
@@ -149,8 +150,7 @@
         from t_ds_process_instance t
         join t_ds_process_definition d on d.id=t.process_definition_id
         join t_ds_project p on p.id=d.project_id
-        where 1 = 1
-        and t.is_sub_process = 0
+        where t.is_sub_process = 0
         <if test="startTime != null and endTime != null">
             and t.start_time <![CDATA[ >= ]]> #{startTime} and t.start_time <![CDATA[ <= ]]> #{endTime}
         </if>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
index a6d72d0d2ddc..44ca97996a14 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
@@ -60,16 +60,17 @@
         inst.process_definition_id AND def.project_id = p.id AND inst.state=1 ) as inst_running_count
         from t_ds_project p
         join t_ds_user u on u.id=p.user_id
-        where 1=1
-        <if test="userId != 0">
-            and p.id in
-            (select project_id from t_ds_relation_project_user where user_id=#{userId}
-            union select id as project_id from t_ds_project where user_id=#{userId}
-            )
-        </if>
-        <if test="searchName!=null and searchName != ''">
-            and p.name like concat('%', #{searchName}, '%')
-        </if>
+        <where>
+            <if test="userId != 0">
+                 p.id in
+                (select project_id from t_ds_relation_project_user where user_id=#{userId}
+                union select id as project_id from t_ds_project where user_id=#{userId}
+                )
+            </if>
+            <if test="searchName!=null and searchName != ''">
+                and p.name like concat('%', #{searchName}, '%')
+            </if>
+        </where>
         order by p.create_time desc
     </select>
     <select id="queryAuthedProjectListByUserId" resultType="org.apache.dolphinscheduler.dao.entity.Project">
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
index de74d6480c86..9180704553c2 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.xml
@@ -23,8 +23,7 @@
     </sql>
     <delete id="deleteProjectRelation">
         delete from t_ds_relation_project_user
-        where 1=1
-        and user_id = #{userId}
+        where user_id = #{userId}
         <if test="projectId != 0 ">
             and project_id = #{projectId}
         </if>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml
index 564dd0354fe8..7b69c0467a67 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml
@@ -25,23 +25,25 @@
         select
         <include refid="baseSql"/>
         from t_ds_queue
-        where 1= 1
-        <if test="searchVal != null and searchVal != ''">
-            and queue_name like concat('%', #{searchVal}, '%')
-        </if>
+        <where>
+            <if test="searchVal != null and searchVal != ''">
+                 queue_name like concat('%', #{searchVal}, '%')
+            </if>
+        </where>
         order by update_time desc
     </select>
     <select id="queryAllQueueList" resultType="org.apache.dolphinscheduler.dao.entity.Queue">
         select
         <include refid="baseSql"/>
         from t_ds_queue
-        where 1=1
-        <if test="queue != null and queue != ''">
-            and queue = #{queue}
-        </if>
-        <if test="queueName != null and queueName != ''">
-            and queue_name =#{queueName}
-        </if>
+        <where>
+            <if test="queue != null and queue != ''">
+                 queue = #{queue}
+            </if>
+            <if test="queueName != null and queueName != ''">
+                and queue_name =#{queueName}
+            </if>
+        </where>
     </select>
 
 </mapper>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
index 6f53979b1e50..4ad4985089f5 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
@@ -30,33 +30,35 @@
         select
         <include refid="baseSql"/>
         from t_ds_resources
-        where 1= 1
-        <if test="fullName != null and fullName != ''">
-            and full_name = #{fullName}
-        </if>
-        <if test="type != -1">
-            and type = #{type}
-        </if>
-        <if test="userId != 0">
-            and user_id = #{userId}
-        </if>
+        <where>
+            <if test="fullName != null and fullName != ''">
+                full_name = #{fullName}
+            </if>
+            <if test="type != -1">
+                and type = #{type}
+            </if>
+            <if test="userId != 0">
+                and user_id = #{userId}
+            </if>
+        </where>
     </select>
     <select id="queryResourceListAuthored" resultType="org.apache.dolphinscheduler.dao.entity.Resource">
         select
         <include refid="baseSql"/>
         from t_ds_resources
-        where 1 = 1
-        <if test="type != -1">
-            and type=#{type}
-        </if>
-        <if test="userId != 0 and perm != 0">
-            and id in (select resources_id from t_ds_relation_resources_user where user_id=#{userId} and perm=#{perm}
-            union select id as resources_id from t_ds_resources where user_id=#{userId})
-        </if>
-        <if test="userId != 0 and perm == 0">
-            and id in (select resources_id from t_ds_relation_resources_user where user_id=#{userId}
-            union select id as resources_id from t_ds_resources where user_id=#{userId})
-        </if>
+        <where>
+            <if test="type != -1">
+                 type=#{type}
+            </if>
+            <if test="userId != 0 and perm != 0">
+                and id in (select resources_id from t_ds_relation_resources_user where user_id=#{userId} and perm=#{perm}
+                union select id as resources_id from t_ds_resources where user_id=#{userId})
+            </if>
+            <if test="userId != 0 and perm == 0">
+                and id in (select resources_id from t_ds_relation_resources_user where user_id=#{userId}
+                union select id as resources_id from t_ds_resources where user_id=#{userId})
+            </if>
+        </where>
     </select>
     <select id="queryResourcePaging" resultType="org.apache.dolphinscheduler.dao.entity.Resource">
         select
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml
index 7fdd09fecc1b..0c4c88bf7290 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.xml
@@ -21,25 +21,27 @@
     <delete id="deleteResourceUser">
         delete
         from t_ds_relation_resources_user
-        where 1 = 1
-        <if test="userId != 0">
-            and user_id = #{userId}
-        </if>
-        <if test="resourceId != 0">
-            and resources_id = #{resourceId}
-        </if>
+        <where>
+            <if test="userId != 0">
+                 user_id = #{userId}
+            </if>
+            <if test="resourceId != 0">
+                and resources_id = #{resourceId}
+            </if>
+        </where>
     </delete>
 
     <delete id="deleteResourceUserArray" parameterType="java.lang.Integer">
         delete
         from t_ds_relation_resources_user
-        where 1 = 1
-        <if test="userId != 0">
-            and user_id = #{userId}
-        </if>
-        and resources_id in
-        <foreach collection="resIds" item="i" open="(" close=")" separator=",">
-            #{i}
-        </foreach>
+        <where>
+            <if test="userId != 0">
+              user_id = #{userId}
+            </if>
+            and resources_id in
+            <foreach collection="resIds" item="i" open="(" close=")" separator=",">
+                #{i}
+            </foreach>
+        </where>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
index 34878af76496..24f43806a0a4 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
@@ -35,10 +35,11 @@
         join t_ds_process_definition p_f on s.process_definition_id = p_f.id
         join t_ds_project as p on p_f.project_id = p.id
         join t_ds_user as u on s.user_id = u.id
-        where 1=1
-        <if test="processDefinitionId!= 0">
-            and s.process_definition_id = #{processDefinitionId}
-        </if>
+        <where>
+            <if test="processDefinitionId!= 0">
+                s.process_definition_id = #{processDefinitionId}
+            </if>
+        </where>
         order by s.update_time desc
     </select>
     <select id="querySchedulerListByProjectName" resultType="org.apache.dolphinscheduler.dao.entity.Schedule">
@@ -53,14 +54,13 @@
         select
         <include refid="baseSql"/>
         from t_ds_schedules
-        where 1= 1
+        where release_state = 1
         <if test="processDefineIds != null and processDefineIds.length != 0 ">
             and process_definition_id in
             <foreach collection="processDefineIds" index="index" item="i" open="(" separator="," close=")">
                 #{i}
             </foreach>
         </if>
-        and release_state = 1
     </select>
     <select id="queryByProcessDefinitionId" resultType="org.apache.dolphinscheduler.dao.entity.Schedule">
         select
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index 71bd251a4a8f..6d6b6d216bb3 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -74,16 +74,17 @@
         from t_ds_task_instance t
         left join t_ds_process_definition d on d.id=t.process_definition_id
         left join t_ds_project p on p.id=d.project_id
-        where 1=1
-        <if test="projectIds != null and projectIds.length != 0">
-            and d.project_id in
-            <foreach collection="projectIds" index="index" item="i" open="(" separator="," close=")">
-                #{i}
-            </foreach>
-        </if>
-        <if test="startTime != null and endTime != null">
-            and t.start_time > #{startTime} and t.start_time <![CDATA[ <= ]]> #{endTime}
-        </if>
+        <where>
+            <if test="projectIds != null and projectIds.length != 0">
+                d.project_id in
+                <foreach collection="projectIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="startTime != null and endTime != null">
+                and t.start_time > #{startTime} and t.start_time <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
         group by t.state
     </select>
     <select id="queryByInstanceIdAndName" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
index 445810dce164..3aa806bc9a29 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
@@ -39,16 +39,17 @@
             <property name="alias" value="udf"/>
         </include>
         from t_ds_udfs udf
-        where 1 = 1
-        <if test="ids != null and ids != ''">
-            and udf.id in
-            <foreach collection="ids" item="i" open="(" close=")" separator=",">
-                #{i}
-            </foreach>
-        </if>
-        <if test="funcNames != null and funcNames != ''">
-            and udf.func_name = #{funcNames}
-        </if>
+        <where>
+            <if test="ids != null and ids != ''">
+                udf.id in
+                <foreach collection="ids" item="i" open="(" close=")" separator=",">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="funcNames != null and funcNames != ''">
+                and udf.func_name = #{funcNames}
+            </if>
+        </where>
         order by udf.id asc
     </select>
     <select id="queryUdfFuncPaging" resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
@@ -57,15 +58,16 @@
             <property name="alias" value="udf"/>
         </include>
         from t_ds_udfs udf
-        where 1=1
-        <if test="searchVal!= null and searchVal != ''">
-            and udf.func_name like concat('%', #{searchVal}, '%')
-        </if>
-        <if test="userId != 0">
-            and udf.id in (
-            select udf_id from t_ds_relation_udfs_user where user_id=#{userId}
-            union select id as udf_id from t_ds_udfs where user_id=#{userId})
-        </if>
+        <where>
+            <if test="searchVal!= null and searchVal != ''">
+                 udf.func_name like concat('%', #{searchVal}, '%')
+            </if>
+            <if test="userId != 0">
+                and udf.id in (
+                select udf_id from t_ds_relation_udfs_user where user_id=#{userId}
+                union select id as udf_id from t_ds_udfs where user_id=#{userId})
+            </if>
+        </where>
         order by udf.create_time desc
     </select>
     <select id="getUdfFuncByType" resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
@@ -120,13 +122,14 @@
             <property name="alias" value="udf"/>
         </include>
         from t_ds_udfs udf
-        where 1=1
-        <if test="resourceIds != null and resourceIds != ''">
-            and udf.resource_id in
-            <foreach collection="resourceIds" item="i" open="(" close=")" separator=",">
-                #{i}
-            </foreach>
-        </if>
+        <where>
+            <if test="resourceIds != null and resourceIds != ''">
+                udf.resource_id in
+                <foreach collection="resourceIds" item="i" open="(" close=")" separator=",">
+                    #{i}
+                </foreach>
+            </if>
+        </where>
     </select>
     <select id="listAuthorizedUdfByResourceId" resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
         select
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
index f4263eb54be4..783359ab8b19 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
@@ -50,10 +50,11 @@
         from t_ds_user u
         left join t_ds_tenant t on u.tenant_id=t.id
         left join t_ds_queue q on t.queue_id = q.id
-        where 1=1
-        <if test="userName!=null and userName != ''">
-            and u.user_name like concat ('%', #{userName}, '%')
-        </if>
+        <where>
+            <if test="userName!=null and userName != ''">
+                u.user_name like concat ('%', #{userName}, '%')
+            </if>
+        </where>
         order by u.update_time desc
     </select>
     <select id="queryDetailsById" resultType="org.apache.dolphinscheduler.dao.entity.User">
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index 411032fd1fd7..32fe0c88eeca 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -42,14 +42,19 @@
 import org.apache.dolphinscheduler.service.alert.AlertClientService;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -131,7 +136,11 @@ public void handle() throws Exception {
             baseDataSource = DataSourceFactory.getDatasource(DbType.valueOf(sqlParameters.getType()),
                     sqlTaskExecutionContext.getConnectionParams());
 
-            // ready to execute SQL and parameter entity Map
+            // spilt and analysis sql
+            String sql = this.analysisSqlScript(sqlParameters.getSql())  ;
+            if (sql != null) {
+                sqlParameters.setSql(sql);
+            }
             SqlBinds mainSqlBinds = getSqlAndSqlParamsMap(sqlParameters.getSql());
             List<SqlBinds> preStatementSqlBinds = Optional.ofNullable(sqlParameters.getPreStatements())
                     .orElse(new ArrayList<>())
@@ -159,6 +168,43 @@ public void handle() throws Exception {
         }
     }
 
+    /**
+     *  spilt and analysis sql
+     * @param sqlScript
+     * @return
+     */
+    private String analysisSqlScript(String sqlScript) {
+        try {
+            BufferedReader br = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(sqlScript.getBytes(Charset.forName("utf8"))), Charset.forName("utf8")));
+            String line;
+            StringBuffer strBuf = new StringBuffer();
+            while ((line = br.readLine()) != null) {
+                if (!("").equals(line.trim()) && !line.trim().startsWith("--")) {
+                    if (line.trim().endsWith(";")) {
+                        strBuf.append(line.trim() + "@_@" + "\r\n");
+                    } else {
+                        strBuf.append(line.trim() + " ");
+                    }
+                }
+            }
+            String s = strBuf.toString();
+            String[] split = s.split("@_@");
+            List<String> collect = Arrays.asList(split).stream().map(a -> {
+                String s1 = a.trim().replaceAll("\r\n", "")
+                        .replaceAll("\n", "")
+                        .replaceAll("\\s+", " ")
+                        .toLowerCase();
+                return s1;
+            }).filter(a -> StringUtils.isNotEmpty(a) || a.startsWith("commit"))
+                    .collect(Collectors.toList());
+            return collect.get(0);
+        } catch (Exception e) {
+            logger.error("analysis sql error", e);
+        }
+        return null;
+    }
+
+
     /**
      * ready to execute SQL and parameter entity Map
      *
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
index e3611ba6a04a..222816a238fe 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
@@ -22,65 +22,85 @@
           size="small"
           style="width: 180px">
     <el-option
-            v-for="item in itemList"
-            :key="item.id"
-            :value="item.id"
-            :label="item.tenantCode">
+        v-for="item in itemList"
+        :key="item.id"
+        :disabled="item.disabled"
+        :label="item.tenantCode"
+        :value="item.id">
     </el-option>
   </el-select>
 </template>
 <script>
-  import disabledState from '@/module/mixin/disabledState'
-  export default {
-    name: 'form-tenant',
-    data () {
-      return {
-        selectedValue: this.value,
-        itemList: []
-      }
-    },
-    mixins: [disabledState],
-    props: {
-      value: {
-        type: String,
-        default: 'default'
-      }
-    },
-    model: {
-      prop: 'value',
-      event: 'tenantSelectEvent'
-    },
-    mounted () {
-      let result = this.itemList.some(item => {
-        if (item.id === this.value) {
-          return true
-        }
-      })
-      if (!result) {
-        this.selectedValue = 'default'
-      }
-    },
-    methods: {
-      _onChange (o) {
-        this.$emit('tenantSelectEvent', o)
-      }
-    },
-    watch: {
-      value (val) {
-        this.selectedValue = val
+import disabledState from '@/module/mixin/disabledState'
+export default {
+  name: 'form-tenant',
+  data() {
+    return {
+      selectedValue: this.value,
+      itemList: []
+    }
+  },
+  mixins: [disabledState],
+  props: {
+    value: {
+      type: String,
+      default: 'default'
+    }
+  },
+  model: {
+    prop: 'value',
+    event: 'tenantSelectEvent'
+  },
+  mounted() {
+    let result = this.itemList.some(item => {
+      if (item.id === this.value) {
+        return true
       }
-    },
-    created () {
-      let stateTenantAllList = this.store.state.security.tenantAllList || []
-      if (stateTenantAllList.length) {
-        this.itemList = stateTenantAllList
+    })
+    if (!result) {
+      this.selectedValue = 'default'
+    }
+  },
+  methods: {
+    _onChange(o) {
+      this.$emit('tenantSelectEvent', o)
+    }
+  },
+  watch: {
+    value(val) {
+      this.selectedValue = val
+    }
+  },
+  created() {
+    let stateTenantAllList = this.store.state.security.tenantAllList || []
+    let currentUserInfo = this.store.state.user.userInfo || []
+    if (stateTenantAllList.length) {
+      this.itemList = stateTenantAllList
+      if (currentUserInfo && currentUserInfo.tenantId === 0) {
+        this.itemList.forEach(function (ele) {
+          ele.disabled = false
+        });
       } else {
-        this.store.dispatch('security/getTenantList').then(res => {
-          this.$nextTick(() => {
-            this.itemList = res
-          })
-        })
+        this.itemList.forEach(function (ele) {
+          ele.id === currentUserInfo.tenantId ? ele.disabled = false : ele.disabled = true
+        });
       }
+    } else {
+      this.store.dispatch('security/getTenantList').then(res => {
+        this.$nextTick(() => {
+          this.itemList = res
+          if (currentUserInfo && currentUserInfo.tenantId === 0) {
+            this.itemList.forEach(function (ele) {
+              ele.disabled = false
+            });
+          } else {
+            this.itemList.forEach(function (ele) {
+              ele.id === currentUserInfo.tenantId ? ele.disabled = false : ele.disabled = true
+            });
+          }
+        })
+      })
     }
   }
+}
 </script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
index 252fedc971d7..0c7ad69b9c8d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
@@ -29,9 +29,9 @@
             </a>
           </div>
         </div>
-        <template v-show="!isNodata">
+        <div v-show="!isNodata">
           <div class="gantt"></div>
-        </template>
+        </div>
         <template v-if="isNodata">
           <m-no-data></m-no-data>
         </template>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
index e4c75864191e..29c72d5fbfd8 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
@@ -21,7 +21,7 @@
         <h2>
           <span>{{name}}</span>
         </h2>
-        <template v-show="isViewType">
+        <div v-show="isViewType">
           <template v-if="!msg">
             <div class="code-mirror-model">
               <textarea id="code-edit-mirror" name="code-edit-mirror"></textarea>
@@ -32,8 +32,7 @@
             </div>
           </template>
           <m-no-data :msg="msg" v-if="msg"></m-no-data>
-
-        </template>
+        </div>
         <template v-if="!isViewType">
           <m-no-type></m-no-type>
         </template>