From 0133dc72b20743eb799223a09775fed57410191f Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Wed, 20 Nov 2024 13:35:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20job=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/geedge/asw/module/runner/entity/JobEntity.java | 2 +- .../geedge/asw/module/runner/job/JobPlaybookExecutor.java | 6 +++--- src/main/resources/db/mapper/runner/JobMapper.xml | 2 +- src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/geedge/asw/module/runner/entity/JobEntity.java b/src/main/java/net/geedge/asw/module/runner/entity/JobEntity.java index e498f1a..cc95fc2 100644 --- a/src/main/java/net/geedge/asw/module/runner/entity/JobEntity.java +++ b/src/main/java/net/geedge/asw/module/runner/entity/JobEntity.java @@ -24,7 +24,7 @@ public class JobEntity { private String packageId; private String envId; private String playbookId; - private String playbookParam; + private String parameters; private Long startTimestamp; private Long endTimestamp; private String status; diff --git a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java index 909726b..3e9907c 100644 --- a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java +++ b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java @@ -158,10 +158,10 @@ public class JobPlaybookExecutor extends QuartzJobBean { PackageEntity packageEntity = packageService.getById(packageId); File packageFile = T.FileUtil.file(packageEntity.getPath()); String packageName = packageEntity.getIdentifier(); - String playbookParam = job.getPlaybookParam(); + String parameters = job.getParameters(); Map params = T.MapUtil.newHashMap(); - if (T.StrUtil.isNotEmpty(playbookParam)) { - params = T.JSONUtil.toBean(playbookParam, Map.class); + if (T.StrUtil.isNotEmpty(parameters)) { + params = T.JSONUtil.toBean(parameters, Map.class); }else { params.put("reInstall", true); params.put("clearCache", true); diff --git a/src/main/resources/db/mapper/runner/JobMapper.xml b/src/main/resources/db/mapper/runner/JobMapper.xml index f78a9f8..3c4c355 100644 --- a/src/main/resources/db/mapper/runner/JobMapper.xml +++ b/src/main/resources/db/mapper/runner/JobMapper.xml @@ -8,7 +8,7 @@ - + diff --git a/src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql b/src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql index 50daf76..4444874 100644 --- a/src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql +++ b/src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql @@ -205,7 +205,7 @@ CREATE TABLE `job` ( `playbook_id` varchar(64) NOT NULL DEFAULT '' COMMENT 'Playbook ID', `package_id` varchar(64) NOT NULL DEFAULT '' COMMENT 'Package ID', `env_id` varchar(64) NOT NULL DEFAULT '' COMMENT 'env ID', - `playbook_param` varchar(1024) NOT NULL DEFAULT '' COMMENT 'playbook运行参数', + `parameters` varchar(1024) NOT NULL DEFAULT '' COMMENT 'playbook运行参数', `start_timestamp` bigint(20) NOT NULL DEFAULT -1 COMMENT '开始时间戳', `end_timestamp` bigint(20) NOT NULL DEFAULT -1 COMMENT '结束时间戳', `status` varchar(64) NOT NULL DEFAULT '' COMMENT '状态; 可选值: created,pending,running,passed,failed,cancel',