From d53d8666243e5584c66235b57d4fe1074613382d Mon Sep 17 00:00:00 2001 From: wangyu096 Date: Wed, 13 Jul 2022 17:52:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E5=8E=9F=E5=AD=90=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=83=BD=E5=8A=9B=E6=94=AF=E6=8C=81=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=20#446?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复修改引入缺陷 --- .../execute/api/esb/v3/EsbFastTransferFileV3ResourceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/v3/EsbFastTransferFileV3ResourceImpl.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/v3/EsbFastTransferFileV3ResourceImpl.java index d088c7a59f..ef7e2e5564 100644 --- a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/v3/EsbFastTransferFileV3ResourceImpl.java +++ b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/v3/EsbFastTransferFileV3ResourceImpl.java @@ -137,8 +137,8 @@ public EsbResp fastTransferFile(EsbFastTransferFileV3Request private ValidateResult checkFileSource(EsbFileSourceV3DTO fileSource) { Integer fileType = fileSource.getFileType(); // fileType是后加的字段，为null则默认为服务器文件不校验 - if (TaskFileTypeEnum.isValid(fileType)) { - return ValidateResult.fail(ErrorCode.MISSING_PARAM_WITH_PARAM_NAME, "file_source.file_type"); + if (fileType != null && !TaskFileTypeEnum.isValid(fileType)) { + return ValidateResult.fail(ErrorCode.ILLEGAL_PARAM_WITH_PARAM_NAME, "file_source.file_type"); } List files = fileSource.getFiles(); if (files == null || files.isEmpty()) { From b3509a2795b3bc7cd5ae29bed5c0e7f038980024 Mon Sep 17 00:00:00 2001 From: wangyu096 Date: Wed, 13 Jul 2022 17:53:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature:=20=E5=8E=9F=E5=AD=90=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=83=BD=E5=8A=9B=E6=94=AF=E6=8C=81=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=20#446?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复修改引入缺陷 --- .../kubernetes/charts/bk-job/Chart.yaml | 4 ++-- .../kubernetes/charts/bk-job/values.yaml | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/support-files/kubernetes/charts/bk-job/Chart.yaml b/support-files/kubernetes/charts/bk-job/Chart.yaml index 55baf58768..ee2de20e9d 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: The BK-JOB is a ops script management and execution system with the capability of dealing with multiple tasks simultaneously. type: application -version: 0.3.0-rc.2 -appVersion: "3.6.0-rc.2" +version: 0.3.0-rc.3 +appVersion: "3.6.0-rc.3" dependencies: - name: common diff --git a/support-files/kubernetes/charts/bk-job/values.yaml b/support-files/kubernetes/charts/bk-job/values.yaml index 5615e3ff18..14d96ab7dc 100644 --- a/support-files/kubernetes/charts/bk-job/values.yaml +++ b/support-files/kubernetes/charts/bk-job/values.yaml @@ -645,7 +645,7 @@ gatewayConfig: image: registry: hub.bktencent.com repository: blueking/job-gateway - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -733,7 +733,7 @@ manageConfig: image: registry: hub.bktencent.com repository: blueking/job-manage - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -791,7 +791,7 @@ executeConfig: image: registry: hub.bktencent.com repository: blueking/job-execute - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -842,7 +842,7 @@ crontabConfig: image: registry: hub.bktencent.com repository: blueking/job-crontab - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -902,7 +902,7 @@ logsvrConfig: image: registry: hub.bktencent.com repository: blueking/job-logsvr - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -957,7 +957,7 @@ backupConfig: image: registry: hub.bktencent.com repository: blueking/job-backup - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -1007,7 +1007,7 @@ analysisConfig: image: registry: hub.bktencent.com repository: blueking/job-analysis - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -1057,7 +1057,7 @@ fileGatewayConfig: image: registry: hub.bktencent.com repository: blueking/job-file-gateway - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -1107,7 +1107,7 @@ fileWorkerConfig: image: registry: hub.bktencent.com repository: blueking/job-file-worker - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -1180,7 +1180,7 @@ frontendConfig: image: registry: hub.bktencent.com repository: blueking/job-frontend - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 pullPolicy: IfNotPresent pullSecrets: [] replicaCount: 1 @@ -1241,7 +1241,7 @@ migration: # 镜像拉取仓库组织与镜像名称 repository: "blueking/job-migration" # 镜像标签 - tag: 3.6.0-rc.2 + tag: 3.6.0-rc.3 # 镜像拉取策略 pullPolicy: IfNotPresent