diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index bb20b2bc7c..8ba7f2bd82 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -7,4 +7,10 @@ assignees: ''
 
 ---
 
+**版本/分支/tag**
 
+**问题描述**
+
+**如何复现**
+
+**预期结果**
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 4f92e912cb..88adcbc190 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -23,5 +23,5 @@ jobs:
       - name: build
         run: |
           export JOB_VERSION=3.latest
-          npm i && npm run build
+          npm i --legacy-peer-deps && npm run build
         working-directory: src/frontend
diff --git a/.gitignore b/.gitignore
index 9e9a9f0926..72e96c54e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,6 @@ out/
 ### application ###
 **/*.log
 support-files/dependJarLists/
-**/*.DS_Store
\ No newline at end of file
+**/*.DS_Store
+.codecc
+build.yml
diff --git a/src/backend/.gitignore b/src/backend/.gitignore
index b265a41ed1..3f6ec1862d 100644
--- a/src/backend/.gitignore
+++ b/src/backend/.gitignore
@@ -5,4 +5,7 @@
 build
 release
 
-**/bin
\ No newline at end of file
+**/bin
+
+.codecc
+build.yml
\ No newline at end of file
diff --git a/src/backend/commons/artifactory-sdk/src/main/java/com/tencent/bk/job/common/artifactory/sdk/ArtifactoryClient.java b/src/backend/commons/artifactory-sdk/src/main/java/com/tencent/bk/job/common/artifactory/sdk/ArtifactoryClient.java
index 928fb1341f..a6164dab2c 100644
--- a/src/backend/commons/artifactory-sdk/src/main/java/com/tencent/bk/job/common/artifactory/sdk/ArtifactoryClient.java
+++ b/src/backend/commons/artifactory-sdk/src/main/java/com/tencent/bk/job/common/artifactory/sdk/ArtifactoryClient.java
@@ -61,6 +61,7 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -385,12 +386,12 @@ public NodeDTO getFileNode(String filePath) {
         return nodeDTO;
     }
 
-    public InputStream getFileInputStream(String filePath) throws ServiceException {
+    public Pair<InputStream, Long> getFileInputStream(String filePath) throws ServiceException {
         List<String> pathList = parsePath(filePath);
         return getFileInputStream(pathList.get(0), pathList.get(1), pathList.get(2));
     }
 
-    public InputStream getFileInputStream(String projectId, String repoName, String filePath) throws ServiceException {
+    public Pair<InputStream, Long> getFileInputStream(String projectId, String repoName, String filePath) throws ServiceException {
         DownloadGenericFileReq req = new DownloadGenericFileReq();
         req.setProject(projectId);
         req.setRepo(repoName);
@@ -400,7 +401,20 @@ public InputStream getFileInputStream(String projectId, String repoName, String
         CloseableHttpResponse resp;
         try {
             resp = longHttpHelper.getRawResp(false, url, getJsonHeaders());
-            return resp.getEntity().getContent();
+            Header contentLengthHeader = resp.getFirstHeader("Content-Length");
+            Long contentLength = null;
+            if (contentLengthHeader != null && StringUtils.isNotBlank(contentLengthHeader.getValue())) {
+                contentLength = Long.parseLong(contentLengthHeader.getValue());
+                log.debug("Content-Length from header:{}", contentLengthHeader.getValue());
+            } else {
+                log.debug("Content-Length from header is null or blank");
+            }
+            if (resp.getStatusLine() != null && resp.getStatusLine().getStatusCode() == 200) {
+                return Pair.of(resp.getEntity().getContent(), contentLength);
+            } else {
+                log.info("resp.statusLine={},resp.entity={}", resp.getStatusLine(), resp.getEntity());
+                throw new InternalException(ErrorCode.FAIL_TO_REQUEST_THIRD_FILE_SOURCE_DOWNLOAD_GENERIC_FILE);
+            }
         } catch (IOException e) {
             log.error("Fail to getFileInputStream", e);
             throw new InternalException(ErrorCode.FAIL_TO_REQUEST_THIRD_FILE_SOURCE_DOWNLOAD_GENERIC_FILE);
diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message.properties
index 2f8bc9c85a..c9c3495b4f 100644
--- a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message.properties
+++ b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message.properties
@@ -104,6 +104,35 @@
 1243013=默认通知策略未配置，请联系管理员
 1243014=账号被引用，禁止删除
 1243015=文件大小超过上限{0}
+1243016=创建 Tag 失败
+1243017=引用的脚本未上线或被删除
+1243018=新建模版失败
+1243019=更新模版失败
+1243020=保存模版发生未知错误
+1243021=标签已存在
+1243022=错误的变量类型
+1243023=新建执行方案失败
+1243024=更新执行方案失败
+1243025=保存执行方案发生未知错误
+1243026=模版不存在
+1243027=创建调试模版失败
+1243028=同步执行方案失败
+1243029=不支持的步骤类型
+1243030=批量操作失败
+1243031=不支持的任务类型
+1243032=新建步骤失败
+1243033=更新步骤失败
+1243034=删除步骤失败
+1243035=更新文件信息失败
+1243036=脚本版本已存在
+1243037=删除失败！存在关联的定时任务
+1243038=删除失败！执行方案存在关联的定时任务
+1243039=脚本版本Id已存在
+1243040=作业模板名称已存在
+1243041=更新模版失败！并发冲突，请不要多次点击保存
+1243045=同步脚本失败
+1243047=脚本版本不存在
+1243048=凭证不存在
 
 ##业务错误-作业执行(job-execute)
 1244001=主机为空
@@ -129,10 +158,17 @@
 1244021=文件任务数量超过限制:{0}
 1244022=脚本任务目标服务器数量超过限制:{0}
 1244023=本地文件{0}在后台不存在
+
+## 业务错误-定时任务(job-crontab)
+1245006=定时任务执行时间已失效
+1245007=定时任务结束时间或通知时间已失效
+1245005=更新定时任务获取锁失败
+
 ##业务错误-日志服务(job-logsvr)
 1246001=获取作业执行日志失败
 1246002=保存作业执行日志失败
 1246003=删除作业执行日志失败
+
 ##业务错误-文件网关服务(job-file-gateway)
 1260001=文件源不存在:{0}
 1260002=接入点响应异常：ListFileNode，详情：{0}
@@ -147,6 +183,7 @@
 1260012=无法根据标识{0}找到文件源
 1260013=文件源服务异常
 1260014=通过[{0}]找不到file-worker
+
 ##业务错误-文件Worker服务(job-file-worker)
 1262001=第三方文件源响应异常：ListBucket，详情：{0}
 1262002=第三方文件源响应异常：ListObjects，详情：{0}
@@ -157,37 +194,8 @@
 
 ##业务错误-用户服务、登录服务
 1247001=用户不存在或者未登录
-1243016=创建 Tag 失败
-1243017=引用的脚本未上线或被删除
-1243018=新建模版失败
-1243019=更新模版失败
-1243020=保存模版发生未知错误
-1243021=标签已存在
-1243022=错误的变量类型
-1243023=新建执行方案失败
-1243024=更新执行方案失败
-1243025=保存执行方案发生未知错误
-1243026=模版不存在
-1243027=创建调试模版失败
-1243028=同步执行方案失败
-1243029=不支持的步骤类型
-1243030=批量操作失败
-1243031=不支持的任务类型
-1243032=新建步骤失败
-1243033=更新步骤失败
-1243034=删除步骤失败
-1243035=更新文件信息失败
-1243036=脚本版本已存在
-1243037=删除失败！存在关联的定时任务
-1243038=删除失败！执行方案存在关联的定时任务
-1243039=脚本版本Id已存在
-1243045=同步脚本失败
-1243047=脚本版本不存在
-1243048=凭证不存在
-1245006=定时任务执行时间已失效
-1245007=定时任务结束时间或通知时间已失效
-1245005=更新定时任务获取锁失败
-1243041=更新模版失败！并发冲突，请不要多次点击保存。
+
+
 
 ##业务错误-备份服务
 1249001=从制品库获取节点信息失败
diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en.properties
index 7ebbf7d502..7d76480be3 100644
--- a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en.properties
+++ b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en.properties
@@ -104,7 +104,35 @@
 1243013=Default notify policies not configed, please contact system administrator
 1243014=Account is referenced and cannot be deleted
 1243015=File size exceeds maximum {0}
-
+1243016=Create tag failed
+1243017=Script version not online or deleted
+1243018=Create job template failed
+1243019=Update job template failed
+1243020=Unknown error while saving job template
+1243021=Tag already exist
+1243022=Wrong variable type
+1243023=Create job plan failed
+1243024=Update job plan failed
+1243025=Unknown error while saving job plan
+1243026=Job template not exist
+1243027=Error while creating debug plan
+1243028=Sync job plan failed
+1243029=Unsupported step type
+1243030=Batch insert failed
+1243031=Unsupported task type
+1243032=Create step failed
+1243033=Update step failed
+1243034=Delete step failed
+1243035=Update file info failed
+1243036=Script version already exist
+1243037=Delete failed! Plan is using by cron job(s)
+1243038=Delete failed! Some plan(s) is(are) using by cron job(s)
+1243039=Script version id already exist
+1243040=Job template name already exist
+1243041=Update template acquire lock failed! Please do not click save multiple times!
+1243045=Sync script failed
+1243047=Script version does not exist
+1243048=Credential not exist
 
 ## Business error - job-execute
 1244001=Host is empty
@@ -130,10 +158,17 @@
 1244021=The number of file tasks exceeds the limit:{0}
 1244022=The number of script task target servers exceeds the limit: {0}
 1244023=The local file {0} not exists in backend
+
+## Business error - job-crontab
+1245006=Cron job execution time already passed
+1245007=Cron job end time or notify time already passed
+1245005=Acquire lock failed while update cron job
+
 ## Business error - job-logsvr
 1246001=Failed to get execution log
 1246002=Failed to save execution log
 1246003=Failed to delete execution log
+
 ## Business error (job-file-gateway)
 1260001=FileSource does not exist:{0}
 1260002=FileWorker response error:ListFileNode, Detail:{0}
@@ -148,6 +183,7 @@
 1260012=Cannot find file source by code:{0}
 1260013=File source service invalid
 1260014=Cannot find file-worker by {0}
+
 ## Business error (job-file-worker)
 1262001=Third file source response error:ListBucket, Detail:{0}
 1262002=Third file source response error:ListObjects, Detail:{0}
@@ -158,37 +194,6 @@
 
 ## Business error - User/Login
 1247001=User does not exist or is not logged in
-1243016=Create tag failed
-1243017=Script version not online or deleted
-1243018=Create job template failed
-1243019=Update job template failed
-1243020=Unknown error while saving job template
-1243021=Tag already exist
-1243022=Wrong variable type
-1243023=Create job plan failed
-1243024=Update job plan failed
-1243025=Unknown error while saving job plan
-1243026=Job template not exist
-1243027=Error while creating debug plan
-1243028=Sync job plan failed
-1243029=Unsupported step type
-1243030=Batch insert failed
-1243031=Unsupported task type
-1243032=Create step failed
-1243033=Update step failed
-1243034=Delete step failed
-1243035=Update file info failed
-1243036=Script version already exist
-1243037=Delete failed! Plan is using by cron job(s)
-1243038=Delete failed! Some plan(s) is(are) using by cron job(s)
-1243039=Script version id already exist
-1243045=Sync script failed
-1243047=Script version does not exist
-1243048=Credential not exist
-1245006=Cron job execution time already passed
-1245007=Cron job end time or notify time already passed
-1245005=Acquire lock failed while update cron job
-1243041=Update template acquire lock failed! Please do not click save multiple times!
 
 ## Business error - Backup
 1249001=Fail to get node info from artifactory
diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en_US.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en_US.properties
index 7ebbf7d502..7d76480be3 100644
--- a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en_US.properties
+++ b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_en_US.properties
@@ -104,7 +104,35 @@
 1243013=Default notify policies not configed, please contact system administrator
 1243014=Account is referenced and cannot be deleted
 1243015=File size exceeds maximum {0}
-
+1243016=Create tag failed
+1243017=Script version not online or deleted
+1243018=Create job template failed
+1243019=Update job template failed
+1243020=Unknown error while saving job template
+1243021=Tag already exist
+1243022=Wrong variable type
+1243023=Create job plan failed
+1243024=Update job plan failed
+1243025=Unknown error while saving job plan
+1243026=Job template not exist
+1243027=Error while creating debug plan
+1243028=Sync job plan failed
+1243029=Unsupported step type
+1243030=Batch insert failed
+1243031=Unsupported task type
+1243032=Create step failed
+1243033=Update step failed
+1243034=Delete step failed
+1243035=Update file info failed
+1243036=Script version already exist
+1243037=Delete failed! Plan is using by cron job(s)
+1243038=Delete failed! Some plan(s) is(are) using by cron job(s)
+1243039=Script version id already exist
+1243040=Job template name already exist
+1243041=Update template acquire lock failed! Please do not click save multiple times!
+1243045=Sync script failed
+1243047=Script version does not exist
+1243048=Credential not exist
 
 ## Business error - job-execute
 1244001=Host is empty
@@ -130,10 +158,17 @@
 1244021=The number of file tasks exceeds the limit:{0}
 1244022=The number of script task target servers exceeds the limit: {0}
 1244023=The local file {0} not exists in backend
+
+## Business error - job-crontab
+1245006=Cron job execution time already passed
+1245007=Cron job end time or notify time already passed
+1245005=Acquire lock failed while update cron job
+
 ## Business error - job-logsvr
 1246001=Failed to get execution log
 1246002=Failed to save execution log
 1246003=Failed to delete execution log
+
 ## Business error (job-file-gateway)
 1260001=FileSource does not exist:{0}
 1260002=FileWorker response error:ListFileNode, Detail:{0}
@@ -148,6 +183,7 @@
 1260012=Cannot find file source by code:{0}
 1260013=File source service invalid
 1260014=Cannot find file-worker by {0}
+
 ## Business error (job-file-worker)
 1262001=Third file source response error:ListBucket, Detail:{0}
 1262002=Third file source response error:ListObjects, Detail:{0}
@@ -158,37 +194,6 @@
 
 ## Business error - User/Login
 1247001=User does not exist or is not logged in
-1243016=Create tag failed
-1243017=Script version not online or deleted
-1243018=Create job template failed
-1243019=Update job template failed
-1243020=Unknown error while saving job template
-1243021=Tag already exist
-1243022=Wrong variable type
-1243023=Create job plan failed
-1243024=Update job plan failed
-1243025=Unknown error while saving job plan
-1243026=Job template not exist
-1243027=Error while creating debug plan
-1243028=Sync job plan failed
-1243029=Unsupported step type
-1243030=Batch insert failed
-1243031=Unsupported task type
-1243032=Create step failed
-1243033=Update step failed
-1243034=Delete step failed
-1243035=Update file info failed
-1243036=Script version already exist
-1243037=Delete failed! Plan is using by cron job(s)
-1243038=Delete failed! Some plan(s) is(are) using by cron job(s)
-1243039=Script version id already exist
-1243045=Sync script failed
-1243047=Script version does not exist
-1243048=Credential not exist
-1245006=Cron job execution time already passed
-1245007=Cron job end time or notify time already passed
-1245005=Acquire lock failed while update cron job
-1243041=Update template acquire lock failed! Please do not click save multiple times!
 
 ## Business error - Backup
 1249001=Fail to get node info from artifactory
diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh.properties
index 2f8bc9c85a..c9c3495b4f 100644
--- a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh.properties
+++ b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh.properties
@@ -104,6 +104,35 @@
 1243013=默认通知策略未配置，请联系管理员
 1243014=账号被引用，禁止删除
 1243015=文件大小超过上限{0}
+1243016=创建 Tag 失败
+1243017=引用的脚本未上线或被删除
+1243018=新建模版失败
+1243019=更新模版失败
+1243020=保存模版发生未知错误
+1243021=标签已存在
+1243022=错误的变量类型
+1243023=新建执行方案失败
+1243024=更新执行方案失败
+1243025=保存执行方案发生未知错误
+1243026=模版不存在
+1243027=创建调试模版失败
+1243028=同步执行方案失败
+1243029=不支持的步骤类型
+1243030=批量操作失败
+1243031=不支持的任务类型
+1243032=新建步骤失败
+1243033=更新步骤失败
+1243034=删除步骤失败
+1243035=更新文件信息失败
+1243036=脚本版本已存在
+1243037=删除失败！存在关联的定时任务
+1243038=删除失败！执行方案存在关联的定时任务
+1243039=脚本版本Id已存在
+1243040=作业模板名称已存在
+1243041=更新模版失败！并发冲突，请不要多次点击保存
+1243045=同步脚本失败
+1243047=脚本版本不存在
+1243048=凭证不存在
 
 ##业务错误-作业执行(job-execute)
 1244001=主机为空
@@ -129,10 +158,17 @@
 1244021=文件任务数量超过限制:{0}
 1244022=脚本任务目标服务器数量超过限制:{0}
 1244023=本地文件{0}在后台不存在
+
+## 业务错误-定时任务(job-crontab)
+1245006=定时任务执行时间已失效
+1245007=定时任务结束时间或通知时间已失效
+1245005=更新定时任务获取锁失败
+
 ##业务错误-日志服务(job-logsvr)
 1246001=获取作业执行日志失败
 1246002=保存作业执行日志失败
 1246003=删除作业执行日志失败
+
 ##业务错误-文件网关服务(job-file-gateway)
 1260001=文件源不存在:{0}
 1260002=接入点响应异常：ListFileNode，详情：{0}
@@ -147,6 +183,7 @@
 1260012=无法根据标识{0}找到文件源
 1260013=文件源服务异常
 1260014=通过[{0}]找不到file-worker
+
 ##业务错误-文件Worker服务(job-file-worker)
 1262001=第三方文件源响应异常：ListBucket，详情：{0}
 1262002=第三方文件源响应异常：ListObjects，详情：{0}
@@ -157,37 +194,8 @@
 
 ##业务错误-用户服务、登录服务
 1247001=用户不存在或者未登录
-1243016=创建 Tag 失败
-1243017=引用的脚本未上线或被删除
-1243018=新建模版失败
-1243019=更新模版失败
-1243020=保存模版发生未知错误
-1243021=标签已存在
-1243022=错误的变量类型
-1243023=新建执行方案失败
-1243024=更新执行方案失败
-1243025=保存执行方案发生未知错误
-1243026=模版不存在
-1243027=创建调试模版失败
-1243028=同步执行方案失败
-1243029=不支持的步骤类型
-1243030=批量操作失败
-1243031=不支持的任务类型
-1243032=新建步骤失败
-1243033=更新步骤失败
-1243034=删除步骤失败
-1243035=更新文件信息失败
-1243036=脚本版本已存在
-1243037=删除失败！存在关联的定时任务
-1243038=删除失败！执行方案存在关联的定时任务
-1243039=脚本版本Id已存在
-1243045=同步脚本失败
-1243047=脚本版本不存在
-1243048=凭证不存在
-1245006=定时任务执行时间已失效
-1245007=定时任务结束时间或通知时间已失效
-1245005=更新定时任务获取锁失败
-1243041=更新模版失败！并发冲突，请不要多次点击保存。
+
+
 
 ##业务错误-备份服务
 1249001=从制品库获取节点信息失败
diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh_CN.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh_CN.properties
index 2f8bc9c85a..c9c3495b4f 100644
--- a/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh_CN.properties
+++ b/src/backend/commons/common-i18n/src/main/resources/i18n/exception/message_zh_CN.properties
@@ -104,6 +104,35 @@
 1243013=默认通知策略未配置，请联系管理员
 1243014=账号被引用，禁止删除
 1243015=文件大小超过上限{0}
+1243016=创建 Tag 失败
+1243017=引用的脚本未上线或被删除
+1243018=新建模版失败
+1243019=更新模版失败
+1243020=保存模版发生未知错误
+1243021=标签已存在
+1243022=错误的变量类型
+1243023=新建执行方案失败
+1243024=更新执行方案失败
+1243025=保存执行方案发生未知错误
+1243026=模版不存在
+1243027=创建调试模版失败
+1243028=同步执行方案失败
+1243029=不支持的步骤类型
+1243030=批量操作失败
+1243031=不支持的任务类型
+1243032=新建步骤失败
+1243033=更新步骤失败
+1243034=删除步骤失败
+1243035=更新文件信息失败
+1243036=脚本版本已存在
+1243037=删除失败！存在关联的定时任务
+1243038=删除失败！执行方案存在关联的定时任务
+1243039=脚本版本Id已存在
+1243040=作业模板名称已存在
+1243041=更新模版失败！并发冲突，请不要多次点击保存
+1243045=同步脚本失败
+1243047=脚本版本不存在
+1243048=凭证不存在
 
 ##业务错误-作业执行(job-execute)
 1244001=主机为空
@@ -129,10 +158,17 @@
 1244021=文件任务数量超过限制:{0}
 1244022=脚本任务目标服务器数量超过限制:{0}
 1244023=本地文件{0}在后台不存在
+
+## 业务错误-定时任务(job-crontab)
+1245006=定时任务执行时间已失效
+1245007=定时任务结束时间或通知时间已失效
+1245005=更新定时任务获取锁失败
+
 ##业务错误-日志服务(job-logsvr)
 1246001=获取作业执行日志失败
 1246002=保存作业执行日志失败
 1246003=删除作业执行日志失败
+
 ##业务错误-文件网关服务(job-file-gateway)
 1260001=文件源不存在:{0}
 1260002=接入点响应异常：ListFileNode，详情：{0}
@@ -147,6 +183,7 @@
 1260012=无法根据标识{0}找到文件源
 1260013=文件源服务异常
 1260014=通过[{0}]找不到file-worker
+
 ##业务错误-文件Worker服务(job-file-worker)
 1262001=第三方文件源响应异常：ListBucket，详情：{0}
 1262002=第三方文件源响应异常：ListObjects，详情：{0}
@@ -157,37 +194,8 @@
 
 ##业务错误-用户服务、登录服务
 1247001=用户不存在或者未登录
-1243016=创建 Tag 失败
-1243017=引用的脚本未上线或被删除
-1243018=新建模版失败
-1243019=更新模版失败
-1243020=保存模版发生未知错误
-1243021=标签已存在
-1243022=错误的变量类型
-1243023=新建执行方案失败
-1243024=更新执行方案失败
-1243025=保存执行方案发生未知错误
-1243026=模版不存在
-1243027=创建调试模版失败
-1243028=同步执行方案失败
-1243029=不支持的步骤类型
-1243030=批量操作失败
-1243031=不支持的任务类型
-1243032=新建步骤失败
-1243033=更新步骤失败
-1243034=删除步骤失败
-1243035=更新文件信息失败
-1243036=脚本版本已存在
-1243037=删除失败！存在关联的定时任务
-1243038=删除失败！执行方案存在关联的定时任务
-1243039=脚本版本Id已存在
-1243045=同步脚本失败
-1243047=脚本版本不存在
-1243048=凭证不存在
-1245006=定时任务执行时间已失效
-1245007=定时任务结束时间或通知时间已失效
-1245005=更新定时任务获取锁失败
-1243041=更新模版失败！并发冲突，请不要多次点击保存。
+
+
 
 ##业务错误-备份服务
 1249001=从制品库获取节点信息失败
diff --git a/src/backend/commons/common-utils/src/main/java/com/tencent/bk/job/common/util/FileUtil.java b/src/backend/commons/common-utils/src/main/java/com/tencent/bk/job/common/util/FileUtil.java
index 9259f233bc..ca0229e851 100644
--- a/src/backend/commons/common-utils/src/main/java/com/tencent/bk/job/common/util/FileUtil.java
+++ b/src/backend/commons/common-utils/src/main/java/com/tencent/bk/job/common/util/FileUtil.java
@@ -77,6 +77,7 @@ public static String writeInsToFile(InputStream ins, String targetPath) throws I
                 fos.write(content, 0, length);
                 Thread.sleep(0);
             }
+            closeFos(fos);
             fis = new FileInputStream(targetPath);
             return DigestUtils.md5Hex(fis);
         } catch (FileNotFoundException e) {
@@ -89,7 +90,7 @@ public static String writeInsToFile(InputStream ins, String targetPath) throws I
             log.info("Download interrupted, targetPath:{}", targetPath);
             throw e;
         } finally {
-            closeStreams(ins, fos, fis);
+            closeStreams(ins, fis);
         }
     }
 
@@ -139,6 +140,8 @@ public static String writeInsToFile(InputStream ins, String targetPath, Long fil
                 }
                 Thread.sleep(0);
             }
+            closeFos(fos);
+            log.info("targetPath:{},totalLength={},fileSize={}", targetPath, totalLength, fileSize);
             currentSpeedWatchTime = System.currentTimeMillis();
             timeDelta = currentSpeedWatchTime - lastSpeedWatchTime;
             long fileSizeDelta = totalLength - lastSpeedWatchFileSize;
@@ -158,13 +161,23 @@ public static String writeInsToFile(InputStream ins, String targetPath, Long fil
             log.info("Download interrupted, targetPath:{}", targetPath);
             throw e;
         } finally {
-            closeStreams(ins, fos, fis);
+            closeStreams(ins, fis);
+        }
+    }
+
+    private static void closeFos(FileOutputStream fos) {
+        if (fos != null) {
+            try {
+                fos.flush();
+                fos.close();
+            } catch (IOException e) {
+                log.error("Fail to close fos", e);
+            }
         }
     }
 
     private static void closeStreams(
         InputStream ins,
-        FileOutputStream fos,
         FileInputStream fis
     ) {
         if (fis != null) {
@@ -181,14 +194,6 @@ private static void closeStreams(
                 log.error("Fail to close ins", e);
             }
         }
-        if (fos != null) {
-            try {
-                fos.flush();
-                fos.close();
-            } catch (IOException e) {
-                log.error("Fail to close fos", e);
-            }
-        }
     }
 
     /**
diff --git a/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/api/web/impl/WebBackupResourceImpl.java b/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/api/web/impl/WebBackupResourceImpl.java
index c22498606e..8a64d14124 100644
--- a/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/api/web/impl/WebBackupResourceImpl.java
+++ b/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/api/web/impl/WebBackupResourceImpl.java
@@ -184,11 +184,12 @@ private Pair<Long, StreamingResponseBody> getFileSizeAndStreamFromArtifactory(St
             throw new InternalException(ErrorCode.FAIL_TO_GET_NODE_INFO_FROM_ARTIFACTORY);
         }
         try {
-            ins = artifactoryClient.getFileInputStream(
+            Pair<InputStream, Long> pair = artifactoryClient.getFileInputStream(
                 artifactoryConfig.getArtifactoryJobProject(),
                 backupStorageConfig.getBackupRepo(),
                 fileName
             );
+            ins = pair.getLeft();
         } catch (Exception e) {
             throw new InternalException(ErrorCode.FAIL_TO_DOWNLOAD_NODE_FROM_ARTIFACTORY);
         }
diff --git a/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/executor/ImportJobExecutor.java b/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/executor/ImportJobExecutor.java
index 7d66dfa0c8..d48538ef83 100644
--- a/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/executor/ImportJobExecutor.java
+++ b/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/executor/ImportJobExecutor.java
@@ -72,6 +72,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
@@ -201,11 +202,12 @@ private void processImportJob(String jobId) {
             // 下载文件
             if (!importFileDirectory.exists()) {
                 log.debug("begin to download from artifactory:{}", importJob.getFileName());
-                InputStream ins = artifactoryClient.getFileInputStream(
+                Pair<InputStream, Long> pair = artifactoryClient.getFileInputStream(
                     artifactoryConfig.getArtifactoryJobProject(),
                     backupStorageConfig.getBackupRepo(),
                     importJob.getFileName()
                 );
+                InputStream ins = pair.getLeft();
                 String localPath = PathUtil.joinFilePath(
                     storageService.getStoragePath(),
                     importJob.getFileName()
diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/web/impl/WebTaskLogResourceImpl.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/web/impl/WebTaskLogResourceImpl.java
index ef1176d897..f9f4dd7da3 100644
--- a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/web/impl/WebTaskLogResourceImpl.java
+++ b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/web/impl/WebTaskLogResourceImpl.java
@@ -218,11 +218,12 @@ private Pair<Long, StreamingResponseBody> getFileSizeAndStreamFromArtifactory(
         }
         try {
             log.debug("get {} fileInputStream from artifactory", exportInfo.getZipFileName());
-            ins = artifactoryClient.getFileInputStream(
+            Pair<InputStream, Long> pair = artifactoryClient.getFileInputStream(
                 artifactoryConfig.getArtifactoryJobProject(),
                 logExportConfig.getLogExportRepo(),
                 exportInfo.getZipFileName()
             );
+            ins = pair.getLeft();
         } catch (Exception e) {
             throw new InternalException(ErrorCode.FAIL_TO_DOWNLOAD_NODE_FROM_ARTIFACTORY);
         }
diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/prepare/local/ArtifactoryLocalFilePrepareTask.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/prepare/local/ArtifactoryLocalFilePrepareTask.java
index c2020275f0..8572f5a904 100644
--- a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/prepare/local/ArtifactoryLocalFilePrepareTask.java
+++ b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/prepare/local/ArtifactoryLocalFilePrepareTask.java
@@ -37,6 +37,7 @@
 import com.tencent.bk.job.logsvr.model.service.ServiceIpLogDTO;
 import com.tencent.bk.job.manage.common.consts.task.TaskFileTypeEnum;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.File;
 import java.io.InputStream;
@@ -217,13 +218,22 @@ public Void call() throws Exception {
             // 制品库的完整路径
             String fullFilePath = PathUtil.joinFilePath(jobLocalUploadRootPath, filePath);
             NodeDTO nodeDTO = artifactoryClient.getFileNode(fullFilePath);
-            InputStream ins = artifactoryClient.getFileInputStream(fullFilePath);
+            Pair<InputStream, Long> pair = artifactoryClient.getFileInputStream(fullFilePath);
+            InputStream ins = pair.getLeft();
+            Long length = pair.getRight();
+            Long fileSize = nodeDTO.getSize();
+            if (fileSize != null && !fileSize.equals(length)) {
+                log.warn("{},ins length={},node.size={}", filePath, length, nodeDTO.getSize());
+            }
+            if (fileSize == null || fileSize <= 0) {
+                fileSize = length;
+            }
             // 保存到本地临时目录
             AtomicInteger speed = new AtomicInteger(0);
             AtomicInteger process = new AtomicInteger(0);
             try {
                 log.debug("Download {} to {}", fullFilePath, localPath);
-                FileUtil.writeInsToFile(ins, localPath, nodeDTO.getSize(), speed, process);
+                FileUtil.writeInsToFile(ins, localPath, fileSize, speed, process);
             } catch (InterruptedException e) {
                 log.warn("Interrupted:Download {} to {}", fullFilePath, localPath);
             } catch (Exception e) {
diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java
index e724ed15d7..747a134693 100644
--- a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java
+++ b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java
@@ -59,6 +59,7 @@
 import com.tencent.bk.job.execute.constants.UserOperationEnum;
 import com.tencent.bk.job.execute.engine.TaskExecuteControlMsgSender;
 import com.tencent.bk.job.execute.engine.model.TaskVariableDTO;
+import com.tencent.bk.job.execute.engine.util.TimeoutUtils;
 import com.tencent.bk.job.execute.model.AccountDTO;
 import com.tencent.bk.job.execute.model.DynamicServerGroupDTO;
 import com.tencent.bk.job.execute.model.DynamicServerTopoNodeDTO;
@@ -220,6 +221,7 @@ public Long createTaskInstanceFast(TaskInstanceDTO taskInstance,
             taskInstance, stepInstance);
         StopWatch watch = new StopWatch("createTaskInstanceFast");
         standardizeStepDynamicGroupId(Collections.singletonList(stepInstance));
+        adjustStepTimeout(stepInstance);
         try {
             // 设置脚本信息
             watch.start("checkAndSetScriptInfoIfScriptTask");
@@ -271,7 +273,15 @@ public Long createTaskInstanceFast(TaskInstanceDTO taskInstance,
                 log.warn("CreateTaskInstanceFast is slow, statistics: {}", watch.prettyPrint());
             }
         }
+    }
 
+    /**
+     * 调整任务超时时间
+     *
+     * @param stepInstance 步骤
+     */
+    private void adjustStepTimeout(StepInstanceDTO stepInstance) {
+        stepInstance.setTimeout(TimeoutUtils.adjustTaskTimeout(stepInstance.getTimeout()));
     }
 
     private void checkAndSetAccountInfo(StepInstanceDTO stepInstance,
@@ -920,6 +930,9 @@ public TaskInstanceDTO createTaskInstanceForTask(TaskExecuteParam executeParam)
             Map<String, TaskVariableDTO> finalVariableValueMap = taskInfo.getVariables();
             ServiceTaskPlanDTO jobPlan = taskInfo.getJobPlan();
 
+            // 调整超时时间
+            stepInstanceList.forEach(this::adjustStepTimeout);
+
             // 检查高危脚本
             watch.start("checkDangerousScript");
             batchCheckScriptMatchDangerousRule(taskInstance, stepInstanceList);
diff --git a/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/DownloadFileTask.java b/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/DownloadFileTask.java
index 7baee5a982..b04cef08f4 100644
--- a/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/DownloadFileTask.java
+++ b/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/DownloadFileTask.java
@@ -32,6 +32,7 @@
 import com.tencent.bk.job.file.worker.model.FileMetaData;
 import com.tencent.bk.job.file_gateway.consts.TaskCommandEnum;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.File;
 import java.io.IOException;
@@ -53,6 +54,7 @@ class DownloadFileTask extends Thread {
     TaskReporter taskReporter;
     DownloadFileTaskEventListener taskEventListener;
     FileProgressWatchingTask watchingTask;
+
     public DownloadFileTask(RemoteClient remoteClient, String taskId, String filePath, String downloadFileDir,
                             String filePrefix, AtomicLong fileSize, AtomicInteger speed, AtomicInteger process,
                             FileProgressWatchingTask watchingTask,
@@ -100,7 +102,12 @@ public void downloadFileToLocal(
                 long fileSize = metaData.getSize();
                 fileMd5 = metaData.getMd5();
                 fileSizeWrapper.set(fileSize);
-                ins = remoteClient.getFileInputStream(filePath);
+                Pair<InputStream, Long> pair = remoteClient.getFileInputStream(filePath);
+                ins = pair.getLeft();
+                Long length = pair.getRight();
+                if (length != null && length != fileSize) {
+                    log.warn("{},fileSize={},ins length={}", filePath, fileSize, length);
+                }
                 currentMd5 = FileUtil.writeInsToFile(ins, targetPath, fileSize, speed, process);
                 if (fileMd5 == null) {
                     log.warn("No Md5 in metadata, do not check,key={},targetPath={},fileMd5={},currentMd5={}",
diff --git a/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/RemoteClient.java b/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/RemoteClient.java
index 1d9f650eb1..99e1d7d24c 100644
--- a/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/RemoteClient.java
+++ b/src/backend/job-file-worker-sdk/service-job-file-worker-sdk/src/main/java/com/tencent/bk/job/file/worker/cos/service/RemoteClient.java
@@ -26,6 +26,7 @@
 
 import com.tencent.bk.job.common.exception.ServiceException;
 import com.tencent.bk.job.file.worker.model.FileMetaData;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.InputStream;
 
@@ -33,7 +34,7 @@ public interface RemoteClient {
 
     FileMetaData getFileMetaData(String filePath);
 
-    InputStream getFileInputStream(String filePath) throws ServiceException;
+    Pair<InputStream, Long> getFileInputStream(String filePath) throws ServiceException;
 
     void shutdown();
 
diff --git a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/artifactory/service/ArtifactoryRemoteClient.java b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/artifactory/service/ArtifactoryRemoteClient.java
index d530942e71..ba35eb0ad2 100644
--- a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/artifactory/service/ArtifactoryRemoteClient.java
+++ b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/artifactory/service/ArtifactoryRemoteClient.java
@@ -31,6 +31,7 @@
 import com.tencent.bk.job.file.worker.model.FileMetaData;
 import io.micrometer.core.instrument.MeterRegistry;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.InputStream;
 
@@ -48,7 +49,7 @@ public FileMetaData getFileMetaData(String filePath) {
     }
 
     @Override
-    public InputStream getFileInputStream(String filePath) throws ServiceException {
+    public Pair<InputStream, Long> getFileInputStream(String filePath) throws ServiceException {
         return super.getFileInputStream(filePath);
     }
 
diff --git a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/JobTencentInnerCOSClient.java b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/JobTencentInnerCOSClient.java
index a80b326bff..4395677e45 100644
--- a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/JobTencentInnerCOSClient.java
+++ b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/JobTencentInnerCOSClient.java
@@ -28,6 +28,7 @@
 import com.tencent.cos.model.Bucket;
 import com.tencent.cos.model.COSObjectSummary;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.File;
 import java.io.InputStream;
@@ -105,7 +106,7 @@ public FileMetaData getFileMetaData(String bucketName, String key) {
             key);
     }
 
-    public InputStream getFileInputStream(String bucketName, String key) {
+    public Pair<InputStream, Long> getFileInputStream(String bucketName, String key) {
         return TencentInnerCOSUtil.getFileInputStream(accessKey, secretKey, regionName, getRealBucketName(bucketName)
             , key);
     }
diff --git a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/TencentInnerCOSUtil.java b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/TencentInnerCOSUtil.java
index 9afcfcc6d1..170527fb59 100644
--- a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/TencentInnerCOSUtil.java
+++ b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/TencentInnerCOSUtil.java
@@ -44,6 +44,7 @@
 import com.tencent.cos.region.Region;
 import com.tencent.cos.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -136,15 +137,15 @@ public static List<COSObjectSummary> listAllObjects(
         }
     }
 
-    public static InputStream getFileInputStream(String accessKey, String secretKey, String regionName,
-                                                 String bucketName, String key) {
+    public static Pair<InputStream, Long> getFileInputStream(String accessKey, String secretKey, String regionName,
+                                                             String bucketName, String key) {
         COSClient cosClient = getCOSClient(accessKey, secretKey, regionName);
         COSObject cosObject = cosClient.getObject(bucketName, key);
         if (cosObject == null) {
             throw new InternalException(ErrorCode.FAIL_TO_REQUEST_THIRD_FILE_SOURCE_DOWNLOAD_GENERIC_FILE,
                 new String[]{String.format("Fail to getObject by bucketName %s key %s", bucketName, key)});
         }
-        return cosObject.getObjectContent();
+        return Pair.of(cosObject.getObjectContent(), cosObject.getObjectMetadata().getContentLength());
     }
 
     public static FileMetaData getFileMetaData(String accessKey, String secretKey, String regionName,
diff --git a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/service/COSRemoteClient.java b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/service/COSRemoteClient.java
index e903a9e57f..ecc7503846 100644
--- a/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/service/COSRemoteClient.java
+++ b/src/backend/job-file-worker/service-job-file-worker/src/main/java/com/tencent/bk/job/file/worker/cos/service/COSRemoteClient.java
@@ -26,6 +26,7 @@
 
 import com.tencent.bk.job.file.worker.cos.JobTencentInnerCOSClient;
 import com.tencent.bk.job.file.worker.model.FileMetaData;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -56,7 +57,7 @@ public FileMetaData getFileMetaData(String filePath) {
     }
 
     @Override
-    public InputStream getFileInputStream(String filePath) {
+    public Pair<InputStream, Long> getFileInputStream(String filePath) {
         List<String> pathList = parsePath(filePath);
         return jobTencentInnerCOSClient.getFileInputStream(pathList.get(0), pathList.get(1));
     }
diff --git a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message.properties b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message.properties
index a384b0e173..f76bb84e88 100644
--- a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message.properties
+++ b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message.properties
@@ -85,8 +85,8 @@ job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小
 job.manage.globalsettings.defaultTitleHead=作业平台
 job.manage.globalsettings.contactBKHelper=联系BK助手
 job.manage.globalsettings.BKDesktop=蓝鲸桌面
-job.manage.globalsettings.ee.footerLink=[QQ咨询(800802001)](tencent://message/?uin=800802001&site=qq&menu=yes) | [蓝鲸论坛](http://bk.tencent.com/s-mart/community) | [蓝鲸官网](http://bk.tencent.com) | [蓝鲸智云桌面]({PAAS_SERVER_URL})
-job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-2020 Tencent BlueKing. All Rights Reserved.
+job.manage.globalsettings.ee.footerLink=[QQ群(495299374)](http://shang.qq.com/wpa/qunwpa?idkey=9b82d33fd1e5b405d6b920d1a4d6aa331a93e18e050addb66796e7d0db80b669) | [社区论坛](https://bk.tencent.com/s-mart/community) | [产品官网](https://bk.tencent.com/index) | [蓝鲸智云桌面]({PAAS_SERVER_URL}/desktop) | [关注我们]()
+job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-{{current_year}} Tencent BlueKing. All Rights Reserved.{{current_ver}}
 
 job.custom.settings.script.template.variable.datetime.desc=当前日期时间
 job.custom.settings.script.template.variable.username.desc=用户名
diff --git a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en.properties b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en.properties
index 6f097dd48d..af142d8a20 100644
--- a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en.properties
+++ b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en.properties
@@ -85,8 +85,8 @@ job.manage.globalsettings.defaultNameRules.description.database=Composed of 1 to
 job.manage.globalsettings.defaultTitleHead=Job
 job.manage.globalsettings.contactBKHelper=Contact BK-Helper
 job.manage.globalsettings.BKDesktop=BlueKing Desktop
-job.manage.globalsettings.ee.footerLink=[QQ(800802001)](tencent://message/?uin=800802001&site=qq&menu=yes) | [BlueKing Forum](http://bk.tencent.com/s-mart/community) | [BlueKing Official](http://bk.tencent.com) | [BlueKing Desktop]({PAAS_SERVER_URL})
-job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-2020 Tencent BlueKing. All Rights Reserved.
+job.manage.globalsettings.ee.footerLink=[QQ Group(800802001)](http://shang.qq.com/wpa/qunwpa?idkey=9b82d33fd1e5b405d6b920d1a4d6aa331a93e18e050addb66796e7d0db80b669) | [Forum](https://bk.tencent.com/s-mart/community) | [Official](https://bk.tencent.com/index) | [Desktop]({PAAS_SERVER_URL}/desktop) | [Follow Us]()
+job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-{{current_year}} Tencent BlueKing. All Rights Reserved.{{current_ver}}
 
 job.custom.settings.script.template.variable.datetime.desc=Current date and time
 job.custom.settings.script.template.variable.username.desc=Username
diff --git a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en_US.properties b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en_US.properties
index 6f097dd48d..af142d8a20 100644
--- a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en_US.properties
+++ b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_en_US.properties
@@ -85,8 +85,8 @@ job.manage.globalsettings.defaultNameRules.description.database=Composed of 1 to
 job.manage.globalsettings.defaultTitleHead=Job
 job.manage.globalsettings.contactBKHelper=Contact BK-Helper
 job.manage.globalsettings.BKDesktop=BlueKing Desktop
-job.manage.globalsettings.ee.footerLink=[QQ(800802001)](tencent://message/?uin=800802001&site=qq&menu=yes) | [BlueKing Forum](http://bk.tencent.com/s-mart/community) | [BlueKing Official](http://bk.tencent.com) | [BlueKing Desktop]({PAAS_SERVER_URL})
-job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-2020 Tencent BlueKing. All Rights Reserved.
+job.manage.globalsettings.ee.footerLink=[QQ Group(800802001)](http://shang.qq.com/wpa/qunwpa?idkey=9b82d33fd1e5b405d6b920d1a4d6aa331a93e18e050addb66796e7d0db80b669) | [Forum](https://bk.tencent.com/s-mart/community) | [Official](https://bk.tencent.com/index) | [Desktop]({PAAS_SERVER_URL}/desktop) | [Follow Us]()
+job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-{{current_year}} Tencent BlueKing. All Rights Reserved.{{current_ver}}
 
 job.custom.settings.script.template.variable.datetime.desc=Current date and time
 job.custom.settings.script.template.variable.username.desc=Username
diff --git a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh.properties b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh.properties
index a384b0e173..f76bb84e88 100644
--- a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh.properties
+++ b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh.properties
@@ -85,8 +85,8 @@ job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小
 job.manage.globalsettings.defaultTitleHead=作业平台
 job.manage.globalsettings.contactBKHelper=联系BK助手
 job.manage.globalsettings.BKDesktop=蓝鲸桌面
-job.manage.globalsettings.ee.footerLink=[QQ咨询(800802001)](tencent://message/?uin=800802001&site=qq&menu=yes) | [蓝鲸论坛](http://bk.tencent.com/s-mart/community) | [蓝鲸官网](http://bk.tencent.com) | [蓝鲸智云桌面]({PAAS_SERVER_URL})
-job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-2020 Tencent BlueKing. All Rights Reserved.
+job.manage.globalsettings.ee.footerLink=[QQ群(495299374)](http://shang.qq.com/wpa/qunwpa?idkey=9b82d33fd1e5b405d6b920d1a4d6aa331a93e18e050addb66796e7d0db80b669) | [社区论坛](https://bk.tencent.com/s-mart/community) | [产品官网](https://bk.tencent.com/index) | [蓝鲸智云桌面]({PAAS_SERVER_URL}/desktop) | [关注我们]()
+job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-{{current_year}} Tencent BlueKing. All Rights Reserved.{{current_ver}}
 
 job.custom.settings.script.template.variable.datetime.desc=当前日期时间
 job.custom.settings.script.template.variable.username.desc=用户名
diff --git a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh_CN.properties b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh_CN.properties
index a384b0e173..f76bb84e88 100644
--- a/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh_CN.properties
+++ b/src/backend/job-manage/boot-job-manage/src/main/resources/i18n/message_zh_CN.properties
@@ -85,8 +85,8 @@ job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小
 job.manage.globalsettings.defaultTitleHead=作业平台
 job.manage.globalsettings.contactBKHelper=联系BK助手
 job.manage.globalsettings.BKDesktop=蓝鲸桌面
-job.manage.globalsettings.ee.footerLink=[QQ咨询(800802001)](tencent://message/?uin=800802001&site=qq&menu=yes) | [蓝鲸论坛](http://bk.tencent.com/s-mart/community) | [蓝鲸官网](http://bk.tencent.com) | [蓝鲸智云桌面]({PAAS_SERVER_URL})
-job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-2020 Tencent BlueKing. All Rights Reserved.
+job.manage.globalsettings.ee.footerLink=[QQ群(495299374)](http://shang.qq.com/wpa/qunwpa?idkey=9b82d33fd1e5b405d6b920d1a4d6aa331a93e18e050addb66796e7d0db80b669) | [社区论坛](https://bk.tencent.com/s-mart/community) | [产品官网](https://bk.tencent.com/index) | [蓝鲸智云桌面]({PAAS_SERVER_URL}/desktop) | [关注我们]()
+job.manage.globalsettings.ee.footerCopyRight=Copyright © 2012-{{current_year}} Tencent BlueKing. All Rights Reserved.{{current_ver}}
 
 job.custom.settings.script.template.variable.datetime.desc=当前日期时间
 job.custom.settings.script.template.variable.username.desc=用户名
diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/GlobalSettingsServiceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/GlobalSettingsServiceImpl.java
index 475c0d4c4f..feff804a11 100644
--- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/GlobalSettingsServiceImpl.java
+++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/impl/GlobalSettingsServiceImpl.java
@@ -84,6 +84,7 @@
 import org.jooq.DSLContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -110,6 +111,8 @@
 public class GlobalSettingsServiceImpl implements GlobalSettingsService {
 
     private static final Pattern PATTERN = Pattern.compile("^([+\\-]?\\d+)([a-zA-Z]{0,2})$");
+    private static final String STRING_TPL_KEY_CURRENT_VERSION = "current_ver";
+    private static final String STRING_TPL_KEY_CURRENT_YEAR = "current_year";
     private DSLContext dslContext;
     private NotifyEsbChannelDAO notifyEsbChannelDAO;
     private AvailableEsbChannelDAO availableEsbChannelDAO;
@@ -120,6 +123,7 @@ public class GlobalSettingsServiceImpl implements GlobalSettingsService {
     private JobManageConfig jobManageConfig;
     private LocalFileConfigForManage localFileConfigForManage;
     private NotifyTemplateConverter notifyTemplateConverter;
+    private BuildProperties buildProperties;
     @Value("${job.manage.upload.filesize.max:5GB}")
     private String configedMaxFileSize;
     @Value("${job.feature.file-manage.enabled:false}")
@@ -132,8 +136,12 @@ public GlobalSettingsServiceImpl(
         , AvailableEsbChannelDAO availableEsbChannelDAO
         , NotifyService notifyService
         , GlobalSettingDAO globalSettingDAO
-        , NotifyTemplateDAO notifyTemplateDAO, MessageI18nService i18nService, JobManageConfig jobManageConfig,
-        LocalFileConfigForManage localFileConfigForManage, NotifyTemplateConverter notifyTemplateConverter) {
+        , NotifyTemplateDAO notifyTemplateDAO,
+        MessageI18nService i18nService,
+        JobManageConfig jobManageConfig,
+        LocalFileConfigForManage localFileConfigForManage,
+        NotifyTemplateConverter notifyTemplateConverter,
+        BuildProperties buildProperties) {
         this.dslContext = dslContext;
         this.notifyEsbChannelDAO = notifyEsbChannelDAO;
         this.availableEsbChannelDAO = availableEsbChannelDAO;
@@ -144,6 +152,7 @@ public GlobalSettingsServiceImpl(
         this.jobManageConfig = jobManageConfig;
         this.localFileConfigForManage = localFileConfigForManage;
         this.notifyTemplateConverter = notifyTemplateConverter;
+        this.buildProperties = buildProperties;
     }
 
     private static String removeSuffixBackSlash(String rawStr) {
@@ -246,7 +255,7 @@ public Integer setHistoryExpireTime(String username, HistoryExpireReq req) {
         Long days = req.getDays();
         if (days == null || days <= 0) {
             throw new InvalidParamException(ErrorCode.ILLEGAL_PARAM_WITH_PARAM_NAME_AND_REASON,
-                new String[] {"days", "days must be positive"});
+                new String[]{"days", "days must be positive"});
         }
         GlobalSettingDTO globalSettingDTO = new GlobalSettingDTO(GlobalSettingKeys.KEY_HISTORY_EXPIRE_DAYS,
             days.toString(), String.format("执行记录保存天数(history expire days):%s,%s", username,
@@ -510,7 +519,7 @@ private TitleFooterVO getEEDefaultTitleFooterVO() {
         );
     }
 
-    private TitleFooterVO getDefaultTitleFooterVO() {
+    private TitleFooterVO getDefaultTitleFooterVOWithoutVersion() {
         String jobEdition = jobManageConfig.getJobEdition();
         if (jobEdition.toLowerCase().equals("ee")) {
             return getEEDefaultTitleFooterVO();
@@ -534,11 +543,27 @@ private TitleFooterVO getInnerDefaultTitleFooterVO() {
 
     @Override
     public TitleFooterVO getTitleFooter() {
+        TitleFooterVO titleFooterVO = getTitleFooterWithoutVersion();
+        // 渲染版本号
+        Map<String, String> valuesMap = new HashMap<>();
+        String pattern = "(\\{\\{(.*?)\\}\\})";
+        valuesMap.put(STRING_TPL_KEY_CURRENT_VERSION, "V" + buildProperties.getVersion());
+        valuesMap.put(STRING_TPL_KEY_CURRENT_YEAR, DateUtils.getCurrentDateStr("yyyy"));
+        titleFooterVO.setFooterCopyRight(
+            StringUtil.replaceByRegex(titleFooterVO.getFooterCopyRight(), pattern, valuesMap)
+        );
+        titleFooterVO.setFooterLink(
+            StringUtil.replaceByRegex(titleFooterVO.getFooterLink(), pattern, valuesMap)
+        );
+        return titleFooterVO;
+    }
+
+    public TitleFooterVO getTitleFooterWithoutVersion() {
         GlobalSettingDTO titleFooterSettingDTO = globalSettingDAO.getGlobalSetting(dslContext,
             GlobalSettingKeys.KEY_TITLE_FOOTER);
         if (titleFooterSettingDTO == null) {
             log.warn("Default titleFooter not configured, use system default, plz contact admin to set");
-            return getDefaultTitleFooterVO();
+            return getDefaultTitleFooterVOWithoutVersion();
         }
         TitleFooterDTO titleFooterDTO = JsonUtils.fromJson(titleFooterSettingDTO.getValue(),
             new TypeReference<TitleFooterDTO>() {
@@ -555,20 +580,20 @@ public TitleFooterVO getTitleFooter() {
                 titleFooter.getFooterLink(), copyRight);
         } else {
             log.warn("TitleFooter of language:{} not configured, use default:zh_CN", normalLang);
-            return getDefaultTitleFooterVO();
+            return getDefaultTitleFooterVOWithoutVersion();
         }
     }
 
     @Override
     public TitleFooterWithDefaultVO getTitleFooterWithDefault(String username) {
-        return new TitleFooterWithDefaultVO(getTitleFooter(), getDefaultTitleFooterVO());
+        return new TitleFooterWithDefaultVO(getTitleFooterWithoutVersion(), getDefaultTitleFooterVOWithoutVersion());
     }
 
     @Override
     public Integer saveChannelTemplate(String username, ChannelTemplateReq req) {
         if (StringUtils.isBlank(req.getChannelCode()) || StringUtils.isBlank(req.getMessageTypeCode())) {
             throw new InvalidParamException(ErrorCode.ILLEGAL_PARAM_WITH_PARAM_NAME_AND_REASON,
-                new String[] {"channelCode", "channelCode cannot be blank"});
+                new String[]{"channelCode", "channelCode cannot be blank"});
         }
         NotifyTemplateDTO notifyTemplateDTO = notifyTemplateDAO.getNotifyTemplate(dslContext, req.getChannelCode(),
             req.getMessageTypeCode(), false);
diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java
index fe92e587d4..a6261f5ab3 100644
--- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java
+++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/template/impl/TaskTemplateServiceImpl.java
@@ -588,7 +588,7 @@ public Long saveTaskTemplateForMigration(
         TaskTemplateInfoDTO taskTemplateByName =
             taskTemplateDAO.getTaskTemplateByName(taskTemplateInfo.getAppId(), taskTemplateInfo.getName());
         if (taskTemplateByName != null) {
-            throw new NotFoundException(ErrorCode.TEMPLATE_NAME_EXIST);
+            throw new AlreadyExistsException(ErrorCode.TEMPLATE_NAME_EXIST);
         }
         taskTemplateService.createNewTagForTemplateIfNotExist(taskTemplateInfo);
 
diff --git a/src/backend/upgrader/build.gradle b/src/backend/upgrader/build.gradle
index 0d0932d10a..6c6cd6b5e1 100644
--- a/src/backend/upgrader/build.gradle
+++ b/src/backend/upgrader/build.gradle
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 plugins {
-    id "com.github.johnrengelman.shadow" version "5.1.0"
+    id "com.github.johnrengelman.shadow" version "7.1.1"
 }
 ext {
     if (System.getProperty("jobVersion")) {
diff --git a/src/frontend/package.json b/src/frontend/package.json
index 5c8143990a..bb20c2c9ea 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -19,7 +19,7 @@
     "@vue/composition-api": "^1.0.0-beta.1",
     "ace-builds": "^1.4.12",
     "axios": "^0.24.0",
-    "bk-magic-vue": "2.4.0-beta.1",
+    "bk-magic-vue": "2.4.0",
     "core-js": "^3.18.1",
     "cron-parser-custom": "^2.13.0",
     "diff": "^5.0.0",
diff --git a/src/frontend/src/components/choose-ip/components/render-business-topology.vue b/src/frontend/src/components/choose-ip/components/render-business-topology.vue
index 68c3896a2a..00d6c40ff8 100644
--- a/src/frontend/src/components/choose-ip/components/render-business-topology.vue
+++ b/src/frontend/src/components/choose-ip/components/render-business-topology.vue
@@ -165,7 +165,6 @@
 </template>
 <script>
     import _ from 'lodash';
-    import Cookie from 'js-cookie';
     import AppManageService from '@service/app-manage';
     import UserService from '@service/user';
     import { topoNodeCache } from '@utils/cache-helper';
@@ -179,7 +178,6 @@
     import HostTable from './host-table';
     import DropdownMenu from './dropdown-menu';
 
-    const RENDER_EMPTY_TOPO_NODE_CACHE_KEY = 'ip_selector_render_empty_topo_node';
     const ROOT_NODE_ID = `#biz#${window.PROJECT_CONFIG.APP_ID}`;
 
     export default {
@@ -200,7 +198,7 @@
                 type: Boolean,
                 default: true,
             },
-            host: {
+            ipList: {
                 type: Array,
                 default: () => [],
             },
@@ -215,7 +213,7 @@
                 isLoading: true,
                 isNodeEmpty: false,
                 // 展示空的拓扑节点
-                isRenderEmptyTopoNode: Cookie.get(RENDER_EMPTY_TOPO_NODE_CACHE_KEY) !== undefined,
+                isRenderEmptyTopoNode: false,
                 // 登录用户
                 currentUser: {},
                 selectedNodeId: ROOT_NODE_ID,
@@ -256,14 +254,14 @@
             /**
              * @desc 选中的主机更新
              */
-            host: {
-                handler (newHost) {
+            ipList: {
+                handler (ipList) {
                     if (this.selfChange) {
                         this.selfChange = false;
                         return;
                     }
                     const checkedMap = {};
-                    newHost.forEach((host) => {
+                    ipList.forEach((host) => {
                         checkedMap[host.realId] = host;
                     });
                     this.pagination.page = 1;
@@ -354,7 +352,8 @@
                     const list = data.data;
                     list.forEach((realId) => {
                         const [
-                            cloudAreaId, ip,
+                            cloudAreaId,
+                            ip,
                         ] = realId.split(':');
                         if (check) {
                             checkedMap[realId] = {
@@ -410,7 +409,7 @@
              */
             triggerChange () {
                 this.selfChange = true;
-                this.$emit('on-change', 'hostTopology', Object.values(this.checkedMap));
+                this.$emit('on-change', 'ipList', Object.values(this.checkedMap));
             },
             /**
              * @desc 切换拓扑树中主机为空的节点
@@ -424,7 +423,6 @@
                     // 显示所有节点，节点的选中状态不变
                     event.stopPropagation();
                     topoNodeCache.clearItem();
-                    // Cookie.set(RENDER_EMPTY_TOPO_NODE_CACHE_KEY, true);
                 } else {
                     // 隐藏空节点时，如果已选的节点将被隐藏自动切换为选中根节点
                     if (selectNode.data.payload.count < 1) {
diff --git a/src/frontend/src/components/choose-ip/components/render-dynamic-business-topology.vue b/src/frontend/src/components/choose-ip/components/render-dynamic-business-topology.vue
index 4beda3c680..d4814f5af6 100644
--- a/src/frontend/src/components/choose-ip/components/render-dynamic-business-topology.vue
+++ b/src/frontend/src/components/choose-ip/components/render-dynamic-business-topology.vue
@@ -26,9 +26,16 @@
 -->
 
 <template>
-    <div class="choose-ip-dinamic-business-topology" v-bkloading="{ isLoading: topologyLoading || isLoading }">
+    <div
+        class="choose-ip-dinamic-business-topology"
+        v-bkloading="{
+            isLoading: topologyLoading || isLoading,
+        }">
         <div class="node-search">
-            <bk-input :placeholder="$t('搜索拓扑节点')" right-icon="bk-icon icon-search" @input="handleSearch" />
+            <bk-input
+                :placeholder="$t('搜索拓扑节点')"
+                right-icon="bk-icon icon-search"
+                @input="handleSearch" />
         </div>
         <empty v-if="emptyTopologyOfAllBusiness" />
         <template v-else>
@@ -39,9 +46,23 @@
                         ref="tree"
                         show-link-line
                         show-checkbox
+                        :expand-on-click="false"
                         @check-change="handleCheckChange">
-                        <div class="node-box" slot-scope="{ data }">
+                        <div class="node-box" slot-scope="{ node: nodeItem, data }">
                             <div class="node-name">{{ data.name }}</div>
+                            <div
+                                v-if="nodeItem.level === 0"
+                                class="node-filter"
+                                @click="handleFilterEmptyToggle">
+                                <template v-if="isRenderEmptyTopoNode">
+                                    <Icon type="eye-slash-shape" />
+                                    <span>隐藏空节点</span>
+                                </template>
+                                <template v-else>
+                                    <Icon type="eye-shape" />
+                                    <span>恢复完整拓扑</span>
+                                </template>
+                            </div>
                             <div class="node-count">{{ data.payload.count }}</div>
                         </div>
                     </bk-big-tree>
@@ -54,12 +75,15 @@
 <script>
     import _ from 'lodash';
     import AppService from '@service/app-manage';
+    import UserService from '@service/user';
     import { ALL_APP_TYPE } from '@utils/constants';
+    import { topoNodeCache } from '@utils/cache-helper';
     import Empty from '@components/empty';
     import {
         findAllChildNodeId,
         resetTree,
         parseIdInfo,
+        filterTopology,
     } from './utils';
 
     export default {
@@ -77,7 +101,7 @@
                 type: Boolean,
                 default: true,
             },
-            node: {
+            topoNodeList: {
                 type: Array,
                 required: true,
             },
@@ -85,17 +109,23 @@
         data () {
             return {
                 isLoading: false,
+                currentUser: {},
+                isRenderEmptyTopoNode: false,
                 isSearchEmpty: false,
                 emptyTopologyOfAllBusiness: true,
             };
         },
         watch: {
-            node (newNode, oldNode) {
+            /**
+             * @desc 更新 topo 树节点的选中状态
+             */
+            topoNodeList (newTopoNodeList, oldTopoNodeList) {
                 if (this.isSelfChange) {
                     this.isSelfChange = false;
                     return;
                 }
-                if (newNode.length < 1) {
+                // 没有选中的节点时重置 topo 树节点的所有状态
+                if (newTopoNodeList.length < 1) {
                     resetTree(this.topologyNodeTree, (node) => {
                         this.$refs.tree.setChecked(node.id, {
                             checked: false,
@@ -106,17 +136,28 @@
                     });
                     return;
                 }
-                this.init(newNode, oldNode);
+                this.recoverTreeState(newTopoNodeList, oldTopoNodeList);
             },
         },
         created () {
             this.isSelfChange = false;
             this.isTreeRefresh = false;
+            this.fetchUserInfo();
         },
         mounted () {
             this.fetchAppList();
         },
         methods: {
+            /**
+             * @desc 获取登陆用户信息
+             */
+            fetchUserInfo () {
+                UserService.fetchUserInfo()
+                    .then((data) => {
+                        this.currentUser = Object.freeze(data);
+                        this.isRenderEmptyTopoNode = topoNodeCache.getItem(data.username);
+                    });
+            },
             /**
              * @desc 获取业务列表
              *
@@ -136,7 +177,7 @@
                             this.$refs.tree.setExpanded(this.topologyNodeTree[0].id, {
                                 expanded: true,
                             });
-                            this.init(this.node);
+                            this.recoverTreeState(this.topoNodeList);
                         });
                     })
                     .finally(() => {
@@ -150,11 +191,11 @@
              *
              * 外部传入值还原树的选中状态
              */
-            init (newNode, oldNode = []) {
+            recoverTreeState (newTopoNodeList, oldTopoNodeList = []) {
                 this.isSearchEmpty = this.topologyNodeTree.length < 1;
-                const isRemove = newNode.length < oldNode.length;
-                const oldNodeId = oldNode.map(item => `#${item.type}#${item.id}`);
-                const newNodeId = newNode.map(item => `#${item.type}#${item.id}`);
+                const isRemove = newTopoNodeList.length < oldTopoNodeList.length;
+                const oldNodeId = oldTopoNodeList.map(item => `#${item.type}#${item.id}`);
+                const newNodeId = newTopoNodeList.map(item => `#${item.type}#${item.id}`);
                 
                 if (isRemove) {
                     // 外部删除操作
@@ -176,8 +217,40 @@
                     }
                 }
             },
-            handleFilterEmptyToggle () {
-                this.$emit('on-topo-empty-filter');
+            
+            handleFilterEmptyToggle (event) {
+                this.isRenderEmptyTopoNode = !this.isRenderEmptyTopoNode;
+                if (this.isRenderEmptyTopoNode) {
+                    // 显示所有节点，节点的选中状态不变
+                    event.stopPropagation();
+                    topoNodeCache.clearItem();
+                } else {
+                    topoNodeCache.setItem(this.currentUser.username);
+                }
+                // 更新节点树时保留树中节点的展开状态
+                const expandIdListMemo = this.$refs.tree.nodes.reduce((result, node) => {
+                    if (node.expanded) {
+                        result.push(node.id);
+                    }
+                    return result;
+                }, []);
+                // 过滤 topo 树
+                const topologyNodeTree = filterTopology(this.topologyNodeTree, this.isRenderEmptyTopoNode);
+                // 重新渲染 topo 树
+                this.$refs.tree.setData(topologyNodeTree);
+                this.$nextTick(() => {
+                    if (topologyNodeTree.length < 1) {
+                        return;
+                    }
+                    // 还原选中状态
+                    this.$refs.tree.setChecked(this.topoNodeList.map(item => `#${item.type}#${item.id}`), {
+                        emitEvent: false,
+                    });
+                    // 还原展开状态
+                    expandIdListMemo.forEach((nodeId) => {
+                        this.$refs.tree.setExpanded(nodeId);
+                    });
+                });
             },
             /**
              * @desc 节点的选中状态改变
@@ -202,9 +275,6 @@
                             // eslint-disable-next-line no-plusplus
                             index++;
                         }
-                        list.forEach(() => {
-                            
-                        });
                         if (index >= list.length) {
                             return list;
                         }
@@ -225,7 +295,7 @@
                     return;
                 }
                 this.isSelfChange = true;
-                this.$emit('on-change', 'nodeId', checkNodeIds.map((item) => {
+                this.$emit('on-change', 'topoNodeList', checkNodeIds.map((item) => {
                     const [type, id] = parseIdInfo(item);
                     return {
                         type,
diff --git a/src/frontend/src/components/choose-ip/components/render-dynamic-group.vue b/src/frontend/src/components/choose-ip/components/render-dynamic-group.vue
index 96f49fff91..f7248727e5 100644
--- a/src/frontend/src/components/choose-ip/components/render-dynamic-group.vue
+++ b/src/frontend/src/components/choose-ip/components/render-dynamic-group.vue
@@ -98,7 +98,7 @@
         },
         inheritAttrs: false,
         props: {
-            dynamicGroup: {
+            dynamicGroupList: {
                 type: Array,
                 required: true,
             },
@@ -141,14 +141,14 @@
             },
         },
         watch: {
-            dynamicGroup: {
-                handler (newDynamicGroup) {
+            dynamicGroupList: {
+                handler (dynamicGroupList) {
                     if (this.selfChange) {
                         this.selfChange = false;
                         return;
                     }
                     const checkedMap = {};
-                    newDynamicGroup.forEach((groupId) => {
+                    dynamicGroupList.forEach((groupId) => {
                         checkedMap[groupId] = true;
                     });
                     this.pagination.page = 1;
@@ -206,7 +206,7 @@
              */
             trigger () {
                 this.selfChange = true;
-                this.$emit('on-change', 'dynamicGroupId', Object.keys(this.checkedMap));
+                this.$emit('on-change', 'dynamicGroupList', Object.keys(this.checkedMap));
             },
             /**
              * @desc 本地搜索动态分组
diff --git a/src/frontend/src/components/choose-ip/components/render-ip-input.vue b/src/frontend/src/components/choose-ip/components/render-ip-input.vue
index 4480f0b0c5..6238026b60 100644
--- a/src/frontend/src/components/choose-ip/components/render-ip-input.vue
+++ b/src/frontend/src/components/choose-ip/components/render-ip-input.vue
@@ -128,17 +128,6 @@
                 return this.invalidIPList.length > 0 || this.errorIPList.length > 0;
             },
         },
-        deactivated () {
-            // this.errorMemo = this.isError;
-            // this.isError = false;
-        },
-        // keep-alive 组件切换时还原 isError 状态
-        activated () {
-            // this.isError = this.errorMemo;
-        },
-        created () {
-            // this.errorMemo = false;
-        },
         methods: {
             /**
              * @desc 更新输入框内容
@@ -310,7 +299,7 @@
                         // 提交输入内容
                         if (hostList.length > 0) {
                             this.shot(() => {
-                                this.$emit('on-change', 'hostInput', hostList);
+                                this.$emit('on-change', 'ipInput', hostList);
                             });
                         }
                         // 正确的 IP 输入，但是 IP 不存于当前业务下
diff --git a/src/frontend/src/components/choose-ip/components/utils.js b/src/frontend/src/components/choose-ip/components/utils.js
index 749ac3a283..c5383ef57b 100644
--- a/src/frontend/src/components/choose-ip/components/utils.js
+++ b/src/frontend/src/components/choose-ip/components/utils.js
@@ -23,9 +23,26 @@
  * IN THE SOFTWARE.
 */
 
+/**
+ * @desc 生成主机的唯一标识 KEY
+ * @param { Object } host
+ * @returns { String }
+ */
 export const generateHostRealId = host => `${host.cloudAreaInfo.id}:${host.ip}`;
+
+/**
+ * @desc 从节点的唯一标识中解析节点的信息
+ * @param { String } id
+ * @returns { Array }
+ */
 export const parseIdInfo = id => id.match(/^#([^#]+)#(.+)$/).slice(1);
 
+/**
+ * @desc 遍历 topo 数据构造 bk-big-tree 需要的数据结构
+ * @param { Array } target api 返回 topo 数据
+ * @param { Number } level 层级
+ * @returns { Boolean }
+ */
 export const bigTreeTransformTopologyOfTopology = (target, level = 0) => {
     if (!target || target.length < 1) {
         return [];
@@ -48,6 +65,12 @@ export const bigTreeTransformTopologyOfTopology = (target, level = 0) => {
     });
 };
 
+/**
+ * @desc 过滤 topo 数据
+ * @param { Array } topologyTreeData topo 数据
+ * @param { Boolean } showEmpty 是否显示主机数为空的 topo 节点
+ * @returns { Array }
+ */
 export const filterTopology = (topologyTreeData, showEmpty = true) => {
     if (!topologyTreeData || topologyTreeData.length < 1) {
         return [];
@@ -71,6 +94,11 @@ export const filterTopology = (topologyTreeData, showEmpty = true) => {
     }, []);
 };
 
+/**
+ * @desc 统计主机的状态信息。总数、有效主机数、无效主机数
+ * @param { Boolean } name
+ * @returns { Boolean }
+ */
 export const statisticsHost = (list) => {
     // 主机的唯一标记是ip + 云区域
     const total = list.length;
@@ -91,6 +119,11 @@ export const statisticsHost = (list) => {
     };
 };
 
+/**
+ * @desc 获取指定节点下面的所有节点
+ * @param { Object } node
+ * @returns { Array }
+ */
 export const findAllChildNodeId = (node) => {
     const childs = [];
     if (node.children) {
@@ -102,6 +135,12 @@ export const findAllChildNodeId = (node) => {
     return childs;
 };
 
+/**
+ * @desc 合并手动输入的主机 IP 到已选的静态 IP中
+ * @param { Array } first 已选的主机列表
+ * @param { Array } second 手动输入的主机列表
+ * @returns { Boolean }
+ */
 export const mergeInputHost = (first, second) => {
     const result = [];
     const firstHostReadIdMap = {};
@@ -148,36 +187,27 @@ export const mergeTopologyHost = (target, preList, lastList) => {
     return mergeInputHost(target, lastList);
 };
 
-export const resetTree = (target, calllback) => {
-    if (!target || target.length < 1) {
+/**
+ * @desc 遍历 topo 数据执行 calllback
+ * @param { Array } topoList
+ * @param { Function } calllback
+ */
+export const resetTree = (topoList, calllback) => {
+    if (!topoList || topoList.length < 1) {
         return;
     }
 
-    target.forEach((curNode) => {
+    topoList.forEach((curNode) => {
         calllback(curNode);
         resetTree(curNode.children, calllback);
     });
 };
 
-export const toggleActive = (target, active, value) => {
-    const arrayAdd = (list, value) => [
-        ...new Set([
-            ...list, value,
-        ]),
-    ];
-    const arrayRemove = (list, value) => {
-        const s = new Set(list);
-        s.delete(value);
-        return [
-            ...s,
-        ];
-    };
-    if (target.length > 0) {
-        return arrayAdd(active, value);
-    }
-    return arrayRemove(active, value);
-};
-
+/**
+ * @desc 主机列表排序
+ * @param { Array } hostList
+ * @returns { Array }
+ */
 export const sortHost = (hostList) => {
     const hostMap = {};
     hostList.forEach((item) => {
diff --git a/src/frontend/src/components/choose-ip/index.vue b/src/frontend/src/components/choose-ip/index.vue
index aa66e05b81..70e267b3e6 100644
--- a/src/frontend/src/components/choose-ip/index.vue
+++ b/src/frontend/src/components/choose-ip/index.vue
@@ -61,9 +61,9 @@
                                 class="fade-in"
                                 :preview-id="previewId"
                                 :topology-node-tree="topologyNodeTree"
-                                :node="nodeId"
-                                :host="hostList"
-                                :dynamic-group="dynamicGroupId"
+                                :ip-list="ipList"
+                                :topo-node-list="topoNodeList"
+                                :dynamic-group-list="dynamicGroupList"
                                 :topology-loading="isLoading"
                                 :dialog-height="dialogHeight"
                                 @on-group-preview="handleGroupPreview"
@@ -80,9 +80,9 @@
             <template v-if="showChoosePreview">
                 <preview
                     v-model="showChoosePreview"
-                    :host="hostList"
-                    :node="nodeId"
-                    :group="dynamicGroupId"
+                    :host="ipList"
+                    :node="topoNodeList"
+                    :group="dynamicGroupList"
                     @on-change="handlePreviewChange">
                     <div slot="desc" v-html="actionResult" />
                 </preview>
@@ -175,7 +175,7 @@
             },
         },
         data () {
-            this.hostListTopolagyLast = [];
+            this.ipListTopolagyLast = [];
             return {
                 isShowDialog: false,
                 isLoading: true,
@@ -188,9 +188,9 @@
                 // 弹框的高度
                 dialogHeight: 0,
                 topologyNodeTree: [],
-                nodeId: [],
-                hostList: [],
-                dynamicGroupId: [],
+                topoNodeList: [],
+                ipList: [],
+                dynamicGroupList: [],
                 previewGroup: {},
                 error: '',
                 currentChangeClass: '',
@@ -235,7 +235,7 @@
              * @returns {Boolean}
              */
             isEmpty () {
-                return !this.nodeId.length && !this.hostList.length && !this.dynamicGroupId.length;
+                return !this.topoNodeList.length && !this.ipList.length && !this.dynamicGroupList.length;
             },
             /**
              * @desc 选择结果的展示
@@ -243,14 +243,14 @@
              */
             actionResult () {
                 const result = [];
-                if (this.hostList.length > 0) {
-                    result.push(`<span class="strong number choose-host">${this.hostList.length}</span>${I18n.t('台主机.select')}`);
+                if (this.ipList.length > 0) {
+                    result.push(`<span class="strong number choose-host">${this.ipList.length}</span>${I18n.t('台主机.select')}`);
                 }
-                if (this.nodeId.length > 0) {
-                    result.push(`<span class="strong number choose-node">${this.nodeId.length}</span>${I18n.t('个节点.select')}`);
+                if (this.topoNodeList.length > 0) {
+                    result.push(`<span class="strong number choose-node">${this.topoNodeList.length}</span>${I18n.t('个节点.select')}`);
                 }
-                if (this.dynamicGroupId.length > 0) {
-                    result.push(`<span class="strong number choose-group">${this.dynamicGroupId.length}</span>${I18n.t('个分组.select')}`);
+                if (this.dynamicGroupList.length > 0) {
+                    result.push(`<span class="strong number choose-group">${this.dynamicGroupList.length}</span>${I18n.t('个分组.select')}`);
                 }
                 if (result.length < 1) {
                     return '';
@@ -288,17 +288,21 @@
                         this.isSelfChange = false;
                         return;
                     }
-                    const { dynamicGroupList = [], ipList = [], topoNodeList = [] } = hostNodeInfo;
+                    const {
+                        dynamicGroupList = [],
+                        ipList = [],
+                        topoNodeList = [],
+                    } = hostNodeInfo;
 
-                    this.nodeId = Object.freeze([
+                    this.topoNodeList = Object.freeze([
                         ...topoNodeList,
                     ]);
-                    this.hostList = Object.freeze(ipList.map(host => Object.assign({
+                    this.ipList = Object.freeze(ipList.map(host => Object.assign({
                         realId: generateHostRealId(host),
                         ...host,
                     })));
-                    this.hostListTopolagyLast = this.hostList;
-                    this.dynamicGroupId = Object.freeze(dynamicGroupList);
+                    this.ipListTopolagyLast = this.ipList;
+                    this.dynamicGroupList = Object.freeze(dynamicGroupList);
                 },
                 immediate: true,
             },
@@ -353,21 +357,21 @@
             handleChange (field, value) {
                 this.error = '';
                 switch (field) {
-                    case 'hostTopology':
-                        this.hostList = Object.freeze(mergeTopologyHost(this.hostList, this.hostListTopolagyLast, value));
-                        this.hostListTopolagyLast = value;
+                    case 'ipList':
+                        this.ipList = Object.freeze(mergeTopologyHost(this.ipList, this.ipListTopolagyLast, value));
+                        this.ipListTopolagyLast = value;
                         this.currentChangeClass = 'host';
                         break;
-                    case 'hostInput':
-                        this.hostList = Object.freeze(mergeInputHost(this.hostList, value));
+                    case 'ipInput':
+                        this.ipList = Object.freeze(mergeInputHost(this.ipList, value));
                         this.currentChangeClass = 'host';
                         break;
-                    case 'nodeId':
-                        this.nodeId = Object.freeze(value);
+                    case 'topoNodeList':
+                        this.topoNodeList = Object.freeze(value);
                         this.currentChangeClass = 'node';
                         break;
-                    case 'dynamicGroupId':
-                        this.dynamicGroupId = Object.freeze(value);
+                    case 'dynamicGroupList':
+                        this.dynamicGroupList = Object.freeze(value);
                         this.currentChangeClass = 'group';
                         break;
                     default:
@@ -403,10 +407,14 @@
              *
              */
             handlePreviewChange (hostNodeInfo) {
-                const { dynamicGroupList, ipList, topoNodeList } = hostNodeInfo;
-                this.nodeId = Object.freeze(topoNodeList);
-                this.hostList = Object.freeze(ipList);
-                this.dynamicGroupId = Object.freeze(dynamicGroupList);
+                const {
+                    dynamicGroupList,
+                    ipList,
+                    topoNodeList,
+                } = hostNodeInfo;
+                this.topoNodeList = Object.freeze(topoNodeList);
+                this.ipList = Object.freeze(ipList);
+                this.dynamicGroupList = Object.freeze(dynamicGroupList);
             },
             /**
              * @desc 查看分组的主机详情
@@ -421,9 +429,9 @@
              * @desc 外部调用，重置选中状态
              */
             reset () {
-                this.nodeId = [];
-                this.hostList = [];
-                this.dynamicGroupId = [];
+                this.topoNodeList = [];
+                this.ipList = [];
+                this.dynamicGroupList = [];
             },
             /**
              * @desc 弹框关闭
@@ -449,9 +457,9 @@
                             .then(() => {
                                 this.isSelfChange = true;
                                 this.$emit('on-change', {
-                                    ipList: this.hostList,
-                                    topoNodeList: this.nodeId,
-                                    dynamicGroupList: this.dynamicGroupId,
+                                    ipList: this.ipList,
+                                    topoNodeList: this.topoNodeList,
+                                    dynamicGroupList: this.dynamicGroupList,
                                 });
                                 this.close();
                             });
@@ -469,15 +477,15 @@
                     topoNodeList = [],
                 } = this.hostNodeInfo;
 
-                this.nodeId = Object.freeze([
+                this.topoNodeList = Object.freeze([
                     ...topoNodeList,
                 ]);
-                this.hostList = Object.freeze(ipList.map(host => ({
+                this.ipList = Object.freeze(ipList.map(host => ({
                     ...host,
                     realId: generateHostRealId(host),
                 })));
-                this.dynamicGroupId = Object.freeze(dynamicGroupList);
-                this.hostListTopolagyLast = this.hostList;
+                this.dynamicGroupList = Object.freeze(dynamicGroupList);
+                this.ipListTopolagyLast = this.ipList;
                 this.isShowDialog = false;
                 this.close();
             },
diff --git a/src/frontend/src/components/task-step/common/timeout.vue b/src/frontend/src/components/task-step/common/timeout.vue
new file mode 100644
index 0000000000..c4db582581
--- /dev/null
+++ b/src/frontend/src/components/task-step/common/timeout.vue
@@ -0,0 +1,154 @@
+<!--
+ * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
+ *
+ * License for BK-JOB蓝鲸智云作业平台:
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+-->
+
+<template>
+    <div>
+        <jb-form-item :label="$t('超时时长')">
+            <div
+                class="form-item-content"
+                @mouseenter="handleMouseenter"
+                @mouseleave="handleMouseleave">
+                <bk-input
+                    ref="input"
+                    type="number"
+                    :value="formData[field]"
+                    :palceholder="$t('此处留空将默认为7200s')"
+                    :min="1"
+                    :max="86400"
+                    :precision="0"
+                    @focus="handleInputFocus"
+                    @blur="handleInputBlur"
+                    @change="handleChange">
+                    <template slot="append">
+                        <div class="group-text">s</div>
+                    </template>
+                </bk-input>
+            </div>
+        </jb-form-item>
+        <div style="display: none;">
+            <div
+                ref="tips"
+                @mouseleave="handleMouseleave"
+                @mouseenter="handleTipsMouseenter">
+                {{ $t('允许最小 1s，最大为 86400s') }}
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import Tippy from 'bk-magic-vue/lib/utils/tippy';
+
+    export default {
+        props: {
+            field: {
+                type: String,
+                required: true,
+            },
+            formData: {
+                type: Object,
+                default: () => ({}),
+            },
+        },
+        methods: {
+            /**
+             * @desc 显示tips
+             */
+            showTips () {
+                if (!this.popperInstance) {
+                    this.popperInstance = Tippy(this.$refs.input.$el, {
+                        arrow: true,
+                        placement: 'right',
+                        trigger: 'manual',
+                        theme: 'light',
+                        interactive: true,
+                        hideOnClick: false,
+                        animation: 'slide-toggle',
+                        lazy: false,
+                        size: 'small',
+                        boundary: 'window',
+                        distance: 20,
+                        zIndex: window.__bk_zIndex_manager.nextZIndex(), // eslint-disable-line no-underscore-dangle
+                    });
+                    this.popperInstance.setContent(this.$refs.tips);
+                }
+                
+                this.popperInstance.show();
+            },
+            /**
+             * @desc 隐藏tips
+             */
+            hideTips () {
+                if (this.isMouseenter) {
+                    return;
+                }
+                this.popperInstance.hide();
+            },
+            /**
+             * @desc 鼠标移入的时候显示tips
+             */
+            handleMouseenter () {
+                clearTimeout(this.hideTimer);
+                this.showTips();
+            },
+            /**
+             * @desc 鼠标移出的时候隐藏tips
+             */
+            handleMouseleave () {
+                this.isMouseenter = false;
+                this.hideTimer = setTimeout(() => {
+                    if (!this.isInputFocus) {
+                        this.hideTips();
+                    }
+                }, 100);
+            },
+            /**
+             * @desc 获得焦点是显示ips
+             */
+            handleInputFocus () {
+                this.isInputFocus = true;
+                this.showTips();
+            },
+            /**
+             * @desc 失去焦点是显示ips
+             */
+            handleInputBlur () {
+                this.isInputFocus = false;
+                this.hideTips();
+            },
+            /**
+             * @desc 鼠标在tips内部时取消隐藏tips定时器
+             */
+            handleTipsMouseenter () {
+                clearTimeout(this.hideTimer);
+                this.isMouseenter = true;
+            },
+            handleChange (value) {
+                this.$emit('on-change', this.field, value);
+            },
+        },
+    };
+</script>
diff --git a/src/frontend/src/components/task-step/file/item-factory.vue b/src/frontend/src/components/task-step/file/item-factory.vue
index 2d6bef18d8..177fa495b7 100644
--- a/src/frontend/src/components/task-step/file/item-factory.vue
+++ b/src/frontend/src/components/task-step/file/item-factory.vue
@@ -26,12 +26,16 @@
 -->
 
 <template>
-    <component :is="itemCom" v-bind="$attrs" v-on="$listeners" />
+    <component
+        :is="itemCom"
+        v-bind="$attrs"
+        v-on="$listeners" />
 </template>
 <script>
     import ErrorHandle from '../common/error-handle';
     import StepName from '../common/name';
     import Rolling from '../common/rolling';
+    import Timeout from '../common/timeout';
     import SourceFileOfExecution from './strategy/source-file-of-execution';
     import SourceFileOfTemplate from './strategy/source-file-of-template';
     import TargetPath from './strategy/target-path';
@@ -39,7 +43,7 @@
     import ExecuteAccount from './strategy/execute-account';
     import TargetServerOfTemplate from './strategy/target-server-of-template';
     import TargetServerOfExecution from './strategy/target-server-of-execution';
-    import Timeout from './strategy/timeout';
+    
     import SpeedLimit from './strategy/speed-limit';
 
     const comMap = {
diff --git a/src/frontend/src/components/task-step/file/strategy/target-path.vue b/src/frontend/src/components/task-step/file/strategy/target-path.vue
index cc000e7c51..c175685602 100644
--- a/src/frontend/src/components/task-step/file/strategy/target-path.vue
+++ b/src/frontend/src/components/task-step/file/strategy/target-path.vue
@@ -27,7 +27,11 @@
 
 <template>
     <div>
-        <jb-form-item :label="$t('目标路径')" required :property="field" :rules="rules">
+        <jb-form-item
+            :label="$t('目标路径')"
+            required
+            :property="field"
+            :rules="rules">
             <div
                 class="form-item-content"
                 @mouseenter="handleMouseenter"
diff --git a/src/frontend/src/components/task-step/file/strategy/timeout.vue b/src/frontend/src/components/task-step/file/strategy/timeout.vue
deleted file mode 100644
index a588c085f3..0000000000
--- a/src/frontend/src/components/task-step/file/strategy/timeout.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
- * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
- *
- * License for BK-JOB蓝鲸智云作业平台:
- *
- *
- * Terms of the MIT License:
- * ---------------------------------------------------
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
- * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
- * the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
- * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
--->
-
-<template>
-    <jb-form-item :label="$t('超时时长')">
-        <bk-input
-            class="form-item-content"
-            type="number"
-            :palceholder="$t('此处留空将默认为7200s')"
-            :min="0"
-            :max="72000"
-            @change="handleChange"
-            :value="formData[field]">
-            <template slot="append">
-                <div class="group-text">s</div>
-            </template>
-        </bk-input>
-    </jb-form-item>
-</template>
-<script>
-    export default {
-        name: '',
-        props: {
-            field: {
-                type: String,
-                required: true,
-            },
-            formData: {
-                type: Object,
-                default: () => ({}),
-            },
-        },
-        methods: {
-            handleChange (value) {
-                this.$emit('on-change', this.field, value);
-            },
-        },
-    };
-</script>
diff --git a/src/frontend/src/components/task-step/script/item-factory.vue b/src/frontend/src/components/task-step/script/item-factory.vue
index 9ca05fd7bc..0a088946b8 100644
--- a/src/frontend/src/components/task-step/script/item-factory.vue
+++ b/src/frontend/src/components/task-step/script/item-factory.vue
@@ -26,17 +26,21 @@
 -->
 
 <template>
-    <component ref="item" :is="itemCom" v-bind="$attrs" v-on="$listeners" />
+    <component
+        ref="item"
+        :is="itemCom"
+        v-bind="$attrs"
+        v-on="$listeners" />
 </template>
 <script>
     import ScriptName from '../common/name';
     import ErrorHandle from '../common/error-handle';
     import Rolling from '../common/rolling';
+    import ScriptTimeout from '../common/timeout';
     import ScriptSourceOfExecution from './strategy/script-source-of-execution';
     import ScriptSourceOfTemplate from './strategy/script-source-of-template';
     import ScriptContent from './strategy/script-content';
     import ScriptParam from './strategy/script-param';
-    import ScriptTimeout from './strategy/script-timeout';
     import ExecuteAccount from './strategy/execute-account';
     import ExecuteTargetOfTemplate from './strategy/execute-target-of-template';
     import ExecuteTargetOfExecution from './strategy/execute-target-of-execution';
diff --git a/src/frontend/src/components/task-step/script/strategy/script-timeout.vue b/src/frontend/src/components/task-step/script/strategy/script-timeout.vue
deleted file mode 100644
index 4722b0dd97..0000000000
--- a/src/frontend/src/components/task-step/script/strategy/script-timeout.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
- * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
- *
- * License for BK-JOB蓝鲸智云作业平台:
- *
- *
- * Terms of the MIT License:
- * ---------------------------------------------------
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
- * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
- * the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
- * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
--->
-
-<template>
-    <jb-form-item :label="$t('超时时长')">
-        <bk-input
-            class="form-item-content"
-            type="number"
-            :palceholder="$t('此处留空将默认为7200s')"
-            :min="0"
-            :max="72000"
-            :precision="0"
-            @change="handleChange"
-            :value="formData[field]">
-            <template slot="append">
-                <div class="group-text">s</div>
-            </template>
-        </bk-input>
-    </jb-form-item>
-</template>
-<script>
-    export default {
-        props: {
-            field: {
-                type: String,
-                required: true,
-            },
-            formData: {
-                type: Object,
-                default: () => ({}),
-            },
-        },
-        methods: {
-            handleChange (value) {
-                this.$emit('on-change', this.field, value);
-            },
-        },
-    };
-</script>
diff --git a/src/frontend/src/i18n/local.js b/src/frontend/src/i18n/local.js
index 28f26b3ee2..07dfcd429e 100644
--- a/src/frontend/src/i18n/local.js
+++ b/src/frontend/src/i18n/local.js
@@ -488,6 +488,7 @@ export default {
     清空搜索条件: 'Empty it',
     提交: 'Commit',
     '标签名已存在，请重新输入': 'Tag name is exists, please try another one',
+    '允许最小 1s，最大为 86400s': 'The minimum is 1s, the maximum is 86400s',
     收起更多: 'Hide',
     展开更多: 'More',
     收起未引用的变量: 'unreferenced variables',
diff --git a/src/frontend/src/views/task-manage/template-operation/index.vue b/src/frontend/src/views/task-manage/template-operation/index.vue
index f73b9a3103..4038460a5e 100644
--- a/src/frontend/src/views/task-manage/template-operation/index.vue
+++ b/src/frontend/src/views/task-manage/template-operation/index.vue
@@ -488,9 +488,8 @@
                                 }
                             }
                             this.planList = Object.freeze(planList);
-                            const isPlanEmpty = planList.length < 1;
                             if (this.isEdit) {
-                                this.editSuccessCallback(taskId, planSync, isPlanEmpty);
+                                this.editSuccessCallback(taskId, planSync);
                             } else {
                                 this.createSuccessCallback(taskId);
                             }
@@ -590,9 +589,8 @@
              * @desc 编辑作业模板成功
              * @param {Number} taskId 作业模板id
              * @param {Boolean} planSync 执行方案是否需要同步
-             * @param {Boolean} isPlanEmpty 作业模板关联的执行方案是否为空
              */
-            editSuccessCallback (taskId, planSync, isPlanEmpty) {
+            editSuccessCallback (taskId, planSync) {
                 let confirmInfo = '';
                 let isClickClose = false;
                 const handleGoTemplateDetail = () => {
@@ -650,7 +648,6 @@
                         </bk-button>
                         <bk-button
                             text
-                            disabled={isPlanEmpty}
                             onClick={handleGoPlan}>
                             {I18n.t('template.查看方案')}
                         </bk-button>
diff --git a/support-files/kubernetes/charts/bk-job/Chart.yaml b/support-files/kubernetes/charts/bk-job/Chart.yaml
index 8828bc665c..4af6d70736 100644
--- a/support-files/kubernetes/charts/bk-job/Chart.yaml
+++ b/support-files/kubernetes/charts/bk-job/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: "bk-job"
 description: A Helm Chart for Blueking Job
 type: application
-version: 0.1.27
-appVersion: "3.4.2-beta.6"
+version: 0.1.28
+appVersion: "3.4.2-beta.7"
 
 dependencies:
 - name: common
diff --git a/support-files/kubernetes/charts/bk-job/templates/bklog.yaml b/support-files/kubernetes/charts/bk-job/templates/bklog.yaml
index 17265c9354..ad2191a846 100644
--- a/support-files/kubernetes/charts/bk-job/templates/bklog.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/bklog.yaml
@@ -14,7 +14,7 @@ spec:
       app.kubernetes.io/name: {{ include "common.names.fullname" . }}
       {{ include "job.labelKeys.jobScope" . }}: {{ include "job.labelValues.jobScope.backend" . }}
   path:
-    - /data/logs/job/job-*/*.log
+    - /data/logs/job-*/*.log
   encoding: 'utf-8'
   multiline:
     pattern: '^\[(?P<log_time>.*?)\]\s+?'
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-analysis/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-analysis/deployment.yaml
index 0b38c78311..1c4351516f 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-analysis/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-analysis/deployment.yaml
@@ -63,16 +63,14 @@ spec:
           image: {{ include "job-analysis.image" . }}
           imagePullPolicy: {{ .Values.analysisConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-analysis"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.analysisConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-analysis.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-analysis
             - name: JOB_APPLICATION_CONFIGMAP_NAME
               value: {{ include "common.names.fullname" . }}-analysis
             - name: JOB_COMMON_CONFIGMAP_NAME
@@ -83,6 +81,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.analysisConfig.containerPort }}
@@ -108,6 +110,8 @@ spec:
           resources:
             {{- toYaml .Values.analysisConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: mariadb
               mountPath: /etc/secrets/mariadb
               readOnly: true
@@ -118,6 +122,9 @@ spec:
               mountPath: /etc/secrets/redis
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: mariadb
           secret:
             secretName: {{ include "job.mariadb.secretName" . }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-backup/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-backup/deployment.yaml
index b89fb14a2e..2917cdbe06 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-backup/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-backup/deployment.yaml
@@ -63,16 +63,14 @@ spec:
           image: {{ include "job-backup.image" . }}
           imagePullPolicy: {{ .Values.backupConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-backup"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.backupConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-backup.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-backup
             - name: JOB_APPLICATION_CONFIGMAP_NAME
               value: {{ include "common.names.fullname" . }}-backup
             - name: JOB_COMMON_CONFIGMAP_NAME
@@ -83,6 +81,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.backupConfig.containerPort }}
@@ -108,6 +110,8 @@ spec:
           resources:
             {{- toYaml .Values.backupConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: mariadb
               mountPath: /etc/secrets/mariadb
               readOnly: true
@@ -118,6 +122,9 @@ spec:
               mountPath: /etc/secrets/redis
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: mariadb
           secret:
             secretName: {{ include "job.mariadb.secretName" . }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-crontab/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-crontab/deployment.yaml
index 3704a5f6cc..64a3eba512 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-crontab/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-crontab/deployment.yaml
@@ -64,16 +64,14 @@ spec:
           image: {{ include "job-crontab.image" . }}
           imagePullPolicy: {{ .Values.crontabConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-crontab"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.crontabConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-crontab.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-crontab
             - name: JOB_APPLICATION_CONFIGMAP_NAME
               value: {{ include "common.names.fullname" . }}-crontab
             - name: JOB_COMMON_CONFIGMAP_NAME
@@ -84,6 +82,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.crontabConfig.containerPort }}
@@ -109,6 +111,8 @@ spec:
           resources:
             {{- toYaml .Values.crontabConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: mariadb
               mountPath: /etc/secrets/mariadb
               readOnly: true
@@ -119,6 +123,9 @@ spec:
               mountPath: /etc/secrets/redis
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: mariadb
           secret:
             secretName: {{ include "job.mariadb.secretName" . }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
index 9b36a2da42..705ad1e6d9 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-execute/deployment.yaml
@@ -63,6 +63,8 @@ spec:
           image: {{ include "job-execute.image" . }}
           imagePullPolicy: {{ .Values.executeConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-execute"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.executeConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
@@ -73,10 +75,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-execute
             - name: BK_JOB_STORAGE_ROOT_PATH
               value: {{ .Values.job.storage.rootPath }}
             - name: JOB_APPLICATION_CONFIGMAP_NAME
@@ -89,6 +87,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.executeConfig.containerPort }}
@@ -114,6 +116,8 @@ spec:
           resources:
             {{- toYaml .Values.executeConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: local-file-dir
               mountPath: {{ .Values.job.storage.rootPath }}
             - name: mariadb
@@ -132,6 +136,9 @@ spec:
               mountPath: /etc/secrets
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: local-file-dir
           hostPath:
             path: {{ .Values.job.storage.rootPath }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-file-gateway/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-file-gateway/deployment.yaml
index f1abfd8a6f..ed4e983874 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-file-gateway/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-file-gateway/deployment.yaml
@@ -63,16 +63,14 @@ spec:
           image: {{ include "job-file-gateway.image" . }}
           imagePullPolicy: {{ .Values.fileGatewayConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-file-gateway"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.fileGatewayConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-file-gateway.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-file-gateway
             - name: JOB_APPLICATION_CONFIGMAP_NAME
               value: {{ include "common.names.fullname" . }}-file-gateway
             - name: JOB_COMMON_CONFIGMAP_NAME
@@ -83,6 +81,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.fileGatewayConfig.containerPort }}
@@ -108,6 +110,8 @@ spec:
           resources:
             {{- toYaml .Values.fileGatewayConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: mariadb
               mountPath: /etc/secrets/mariadb
               readOnly: true
@@ -118,6 +122,9 @@ spec:
               mountPath: /etc/secrets/redis
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: mariadb
           secret:
             secretName: {{ include "job.mariadb.secretName" . }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-file-worker/statefulset.yaml b/support-files/kubernetes/charts/bk-job/templates/job-file-worker/statefulset.yaml
index f284962d4b..23ed28db7f 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-file-worker/statefulset.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-file-worker/statefulset.yaml
@@ -62,16 +62,14 @@ spec:
           image: {{ include "job-file-worker.image" . }}
           imagePullPolicy: {{ .Values.fileWorkerConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-file-worker"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.fileWorkerConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-file-worker.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-file-worker
             - name: BK_JOB_FILE_WORKER_WORKSPACE_DIR
               value: {{ .Values.fileWorkerConfig.downloadFile.dir }}/JobFileWorkerWorkspace
             - name: BK_JOB_NODE_IP
@@ -94,6 +92,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.fileWorkerConfig.containerPort }}
@@ -119,9 +121,14 @@ spec:
           resources:
             {{- toYaml .Values.fileWorkerConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: workspace
               mountPath: {{ .Values.fileWorkerConfig.downloadFile.dir }}/JobFileWorkerWorkspace
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: workspace
           hostPath:
             path: {{ .Values.fileWorkerConfig.downloadFile.dir }}/JobFileWorkerWorkspace
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-gateway/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-gateway/deployment.yaml
index 2517face0b..e19a7bf9cb 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-gateway/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-gateway/deployment.yaml
@@ -61,16 +61,14 @@ spec:
           image: {{ include "job-gateway.image" . }}
           imagePullPolicy: {{ .Values.gatewayConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-gateway"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.gatewayConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-gateway.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-gateway
             - name: JOB_APPLICATION_CONFIGMAP_NAME
               value: {{ include "common.names.fullname" . }}-gateway
             - name: JOB_COMMON_CONFIGMAP_NAME
@@ -81,6 +79,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.gatewayConfig.containerPort.http }}
@@ -112,6 +114,8 @@ spec:
           resources:
             {{- toYaml .Values.gatewayConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: job-gateway-tls-certs
               mountPath: /data/job/cert
               readOnly: true
@@ -119,6 +123,9 @@ spec:
               mountPath: /etc/secrets
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: job-gateway-tls-certs
           secret:
             secretName: {{ printf "%s-gateway-%s" (include "common.names.fullname" .) "tls-cert" }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-logsvr/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-logsvr/deployment.yaml
index dd181edb78..9ab4b5498d 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-logsvr/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-logsvr/deployment.yaml
@@ -61,16 +61,14 @@ spec:
           image: {{ include "job-logsvr.image" . }}
           imagePullPolicy: {{ .Values.logsvrConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-logsvr"
             - name: BK_JOB_JVM_OPTION
               value: {{ .Values.logsvrConfig.jvmOptions | quote }}
             - name: BK_JOB_PROFILE
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-logsvr.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: /data/logs/job
-            - name: BK_JOB_LOG_DIR
-              value: /data/logs/job/job-logsvr
             - name: JOB_APPLICATION_CONFIGMAP_NAME
               value: {{ include "common.names.fullname" . }}-logsvr
             - name: JOB_COMMON_CONFIGMAP_NAME
@@ -81,6 +79,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.logsvrConfig.containerPort }}
@@ -106,10 +108,15 @@ spec:
           resources:
             {{- toYaml .Values.logsvrConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: mongodb
               mountPath: /etc/secrets/mongodb
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: mongodb
           secret:
             secretName: {{ include "job.mongodb.secretName" . }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-manage/deployment.yaml b/support-files/kubernetes/charts/bk-job/templates/job-manage/deployment.yaml
index 52ff545c85..2254090f47 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-manage/deployment.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-manage/deployment.yaml
@@ -63,6 +63,8 @@ spec:
           image: {{ include "job-manage.image" . }}
           imagePullPolicy: {{ .Values.manageConfig.image.pullPolicy }}
           env:
+            - name: BK_JOB_APP_NAME
+              value: "job-manage"
             - name: BK_JOB_EDITION
               value: {{ .Values.job.edition }}
             - name: BK_JOB_JVM_OPTION
@@ -71,10 +73,6 @@ spec:
               value: {{ include "job.profile" . }}
             - name: BK_JOB_JAR
               value: job-manage.jar
-            - name: BK_JOB_LOG_BASE_DIR
-              value: "/data/logs/job"
-            - name: BK_JOB_LOG_DIR
-              value: "/data/logs/job/job-manage"
             - name: JOB_APPLICATION_CONFIGMAP_NAME
               value: {{ include "common.names.fullname" . }}-manage
             - name: JOB_COMMON_CONFIGMAP_NAME
@@ -85,6 +83,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: BK_JOB_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: http
               containerPort: {{ .Values.manageConfig.containerPort }}
@@ -110,6 +112,8 @@ spec:
           resources:
             {{- toYaml .Values.manageConfig.resources | nindent 12 }}
           volumeMounts:
+            - name: job-storage
+              mountPath: /data/job/storage
             - name: mariadb
               mountPath: /etc/secrets/mariadb
               readOnly: true
@@ -126,6 +130,9 @@ spec:
               mountPath: /etc/secrets
               readOnly: true
       volumes:
+        - name: job-storage
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-pv-claim
         - name: mariadb
           secret:
             secretName: {{ include "job.mariadb.secretName" . }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-migration/job.yaml b/support-files/kubernetes/charts/bk-job/templates/job-migration/job.yaml
index 961b4cc86c..5fa4bc323e 100644
--- a/support-files/kubernetes/charts/bk-job/templates/job-migration/job.yaml
+++ b/support-files/kubernetes/charts/bk-job/templates/job-migration/job.yaml
@@ -33,7 +33,7 @@ spec:
           image: {{ include "job-migration.image" . }}
           imagePullPolicy: {{ .Values.migration.image.pullPolicy }}
           command: ["bash"]
-          args: ["/data/job/startup.sh"]
+          args: ["/data/job/exec/startup.sh"]
           env:
             - name: BK_JOB_MYSQL_HOST
               value: {{ include "job.mariadb.host" . | quote }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/pv-default.yaml b/support-files/kubernetes/charts/bk-job/templates/pv-default.yaml
new file mode 100644
index 0000000000..7c17ee42b9
--- /dev/null
+++ b/support-files/kubernetes/charts/bk-job/templates/pv-default.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ include "common.names.fullname" . }}-local
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+    type: local
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  storageClassName: manual
+  capacity:
+    storage: {{ .Values.job.pv.storage }}
+  accessModes:
+    - ReadWriteMany
+  hostPath:
+    path: {{ .Values.job.pv.path }}
diff --git a/support-files/kubernetes/charts/bk-job/templates/pvc-storage.yaml b/support-files/kubernetes/charts/bk-job/templates/pvc-storage.yaml
new file mode 100644
index 0000000000..8c36b8aba6
--- /dev/null
+++ b/support-files/kubernetes/charts/bk-job/templates/pvc-storage.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "common.names.fullname" . }}-pv-claim
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  storageClassName: manual
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.job.pv.storage }}
diff --git a/support-files/kubernetes/charts/bk-job/values.yaml b/support-files/kubernetes/charts/bk-job/values.yaml
index 452984105e..bea5180c38 100644
--- a/support-files/kubernetes/charts/bk-job/values.yaml
+++ b/support-files/kubernetes/charts/bk-job/values.yaml
@@ -491,6 +491,10 @@ job:
       enabled: true
   # 各微服务Actuator监控端口
   managePort: 19876
+  # 存储分配
+  pv:
+    path: "/data/bkjob"
+    storage: 100Gi
 
 ## @section job-gateway parameters
 gatewayConfig:
@@ -500,7 +504,7 @@ gatewayConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-gateway
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -567,7 +571,7 @@ manageConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-manage
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -616,7 +620,7 @@ executeConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-execute
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -662,7 +666,7 @@ crontabConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-crontab
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -716,7 +720,7 @@ logsvrConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-logsvr
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -763,7 +767,7 @@ backupConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-backup
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -807,7 +811,7 @@ analysisConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-analysis
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -851,7 +855,7 @@ fileGatewayConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-file-gateway
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -895,7 +899,7 @@ fileWorkerConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-file-worker
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -951,7 +955,7 @@ frontendConfig:
   image:
     registry: mirrors.tencent.com
     repository: bkce/job-frontend
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -1011,5 +1015,5 @@ migration:
   image:
     registry: "mirrors.tencent.com"
     repository: "bkce/job-migration"
-    tag: 3.4.2-beta.6
+    tag: 3.4.2-beta.7
     pullPolicy: IfNotPresent
diff --git a/support-files/kubernetes/images/backend/backend.Dockerfile b/support-files/kubernetes/images/backend/backend.Dockerfile
index 5af352a2ed..8add28f648 100644
--- a/support-files/kubernetes/images/backend/backend.Dockerfile
+++ b/support-files/kubernetes/images/backend/backend.Dockerfile
@@ -2,17 +2,17 @@ FROM blueking/jdk:0.0.1
 
 LABEL maintainer="Tencent BlueKing Job"
 
-ENV BK_JOB_HOME=/data/job \
-    BK_JOB_LOGS_DIR=/data/job/logs
+ENV BK_JOB_HOME=/data/job/exec \
+    BK_JOB_LOGS_DIR=/data/job/storage/logs
 
-COPY ./ /data/job/
+COPY ./ /data/job/exec/
 RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo 'Asia/Shanghai' > /etc/timezone && \
-    chmod +x /data/job/startup.sh
+    chmod +x /data/job/exec/startup.sh
 
 ENV LANG en_US.utf8
 ENV LANGUAGE en_US.utf8
 ENV LC_ALL en_US.utf8
 
-WORKDIR /data/job
-CMD /data/job/startup.sh
+WORKDIR /data/job/exec
+CMD /data/job/exec/startup.sh
diff --git a/support-files/kubernetes/images/backend/startup.sh b/support-files/kubernetes/images/backend/startup.sh
index 9ae1f94b52..42ff75fbe5 100644
--- a/support-files/kubernetes/images/backend/startup.sh
+++ b/support-files/kubernetes/images/backend/startup.sh
@@ -1,5 +1,16 @@
 #! /bin/sh
 
+BK_JOB_STORAGE_BASE_DIR="/data/job/storage"
+
+echo "BK_JOB_APP_NAME=$BK_JOB_APP_NAME"
+echo "KUBERNETES_NAMESPACE=$KUBERNETES_NAMESPACE"
+echo "BK_JOB_POD_NAME=$BK_JOB_POD_NAME"
+echo "BK_JOB_STORAGE_BASE_DIR=$BK_JOB_STORAGE_BASE_DIR"
+
+# 拼接日志相关路径
+BK_JOB_LOG_BASE_DIR="$BK_JOB_STORAGE_BASE_DIR/$KUBERNETES_NAMESPACE/$BK_JOB_POD_NAME/logs"
+BK_JOB_LOG_DIR="$BK_JOB_LOG_BASE_DIR/$BK_JOB_APP_NAME"
+
 echo "BK_JOB_LOG_BASE_DIR=$BK_JOB_LOG_BASE_DIR"
 mkdir -p "$BK_JOB_LOG_BASE_DIR"
 chmod 777 "$BK_JOB_LOG_BASE_DIR"
@@ -8,6 +19,8 @@ echo "BK_JOB_LOG_DIR=$BK_JOB_LOG_DIR"
 mkdir -p "$BK_JOB_LOG_DIR"
 chmod 777 "$BK_JOB_LOG_DIR"
 
+# 创建软链接供容器内日志采集使用
+ln -s $BK_JOB_LOG_BASE_DIR /data/logs
 ls $BK_JOB_LOG_BASE_DIR
 
 java -server \
@@ -25,4 +38,4 @@ java -server \
      -XX:ErrorFile=$BK_JOB_LOG_DIR/error_sys.log \
      -Dspring.profiles.active=$BK_JOB_PROFILE \
      $BK_JOB_JVM_OPTION \
-     -jar /data/job/$BK_JOB_JAR
+     -jar /data/job/exec/$BK_JOB_JAR
diff --git a/support-files/kubernetes/images/file-worker/fileWorker.Dockerfile b/support-files/kubernetes/images/file-worker/fileWorker.Dockerfile
index 5af352a2ed..e4b9eb4360 100644
--- a/support-files/kubernetes/images/file-worker/fileWorker.Dockerfile
+++ b/support-files/kubernetes/images/file-worker/fileWorker.Dockerfile
@@ -2,17 +2,17 @@ FROM blueking/jdk:0.0.1
 
 LABEL maintainer="Tencent BlueKing Job"
 
-ENV BK_JOB_HOME=/data/job \
+ENV BK_JOB_HOME=/data/job/exec \
     BK_JOB_LOGS_DIR=/data/job/logs
 
-COPY ./ /data/job/
+COPY ./ /data/job/exec/
 RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo 'Asia/Shanghai' > /etc/timezone && \
-    chmod +x /data/job/startup.sh
+    chmod +x /data/job/exec/startup.sh
 
 ENV LANG en_US.utf8
 ENV LANGUAGE en_US.utf8
 ENV LC_ALL en_US.utf8
 
-WORKDIR /data/job
-CMD /data/job/startup.sh
+WORKDIR /data/job/exec
+CMD /data/job/exec/startup.sh
diff --git a/support-files/kubernetes/images/file-worker/startup.sh b/support-files/kubernetes/images/file-worker/startup.sh
index 4898ff0fb6..a40a02e926 100644
--- a/support-files/kubernetes/images/file-worker/startup.sh
+++ b/support-files/kubernetes/images/file-worker/startup.sh
@@ -1,5 +1,16 @@
 #! /bin/sh
 
+BK_JOB_STORAGE_BASE_DIR="/data/job/storage"
+
+echo "BK_JOB_APP_NAME=$BK_JOB_APP_NAME"
+echo "KUBERNETES_NAMESPACE=$KUBERNETES_NAMESPACE"
+echo "BK_JOB_POD_NAME=$BK_JOB_POD_NAME"
+echo "BK_JOB_STORAGE_BASE_DIR=$BK_JOB_STORAGE_BASE_DIR"
+
+# 拼接日志相关路径
+BK_JOB_LOG_BASE_DIR="$BK_JOB_STORAGE_BASE_DIR/$KUBERNETES_NAMESPACE/$BK_JOB_POD_NAME/logs"
+BK_JOB_LOG_DIR="$BK_JOB_LOG_BASE_DIR/$BK_JOB_APP_NAME"
+
 echo "BK_JOB_LOG_BASE_DIR=$BK_JOB_LOG_BASE_DIR"
 mkdir -p "$BK_JOB_LOG_BASE_DIR"
 chmod 777 "$BK_JOB_LOG_BASE_DIR"
@@ -14,6 +25,7 @@ chmod 777 "$BK_JOB_FILE_WORKER_WORKSPACE_DIR"
 
 echo "BK_JOB_NODE_IP=$BK_JOB_NODE_IP"
 
+ln -s $BK_JOB_LOG_BASE_DIR /data/logs
 ls $BK_JOB_LOG_BASE_DIR
 
 java -server \
@@ -31,4 +43,4 @@ java -server \
      -XX:ErrorFile=$BK_JOB_LOG_DIR/error_sys.log \
      -Dspring.profiles.active=$BK_JOB_PROFILE \
      $BK_JOB_JVM_OPTION \
-     -jar /data/job/$BK_JOB_JAR
+     -jar /data/job/exec/$BK_JOB_JAR
diff --git a/support-files/kubernetes/images/migration/migration.Dockerfile b/support-files/kubernetes/images/migration/migration.Dockerfile
index 2580df9384..b89304848a 100644
--- a/support-files/kubernetes/images/migration/migration.Dockerfile
+++ b/support-files/kubernetes/images/migration/migration.Dockerfile
@@ -2,10 +2,10 @@ FROM blueking/jdk:0.0.1
 
 LABEL maintainer="Tencent BlueKing Job"
 
-ENV BK_JOB_HOME=/data/job \
-    BK_JOB_LOGS_DIR=/data/job/logs
+ENV BK_JOB_HOME=/data/job/exec \
+    BK_JOB_LOGS_DIR=/data/job/storage/logs
 
-COPY ./ /data/job/
+COPY ./ /data/job/exec/
 
 RUN yum -y install mysql
 RUN yum install -y epel-release
@@ -14,11 +14,11 @@ RUN pip install requests
 
 RUN ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo 'Asia/Shanghai' > /etc/timezone && \
-    chmod +x /data/job/startup.sh
+    chmod +x /data/job/exec/startup.sh
 
 ENV LANG en_US.utf8
 ENV LANGUAGE en_US.utf8
 ENV LC_ALL en_US.utf8
 
-WORKDIR /data/job
-CMD /data/job/startup.sh
+WORKDIR /data/job/exec
+CMD /data/job/exec/startup.sh