gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 调整 job 属性名称

Browse Source
This commit is contained in:
zhangshuai
2024-11-20 13:35:30 +08:00
parent 30b3f1c101
commit 0133dc72b2
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/geedge/asw/module/runner/entity/JobEntity.java
View File

@@ -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;

6
src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecutor.java
View File

@@ -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<String, Object> 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);

2
src/main/resources/db/mapper/runner/JobMapper.xml
View File

@@ -8,7 +8,7 @@
<result property="playbookId" column="playbook_id"/>
<result property="packageId" column="package_id"/>
<result property="envId" column="env_id"/>
<result property="playbookParam" column="playbook_param"/>
<result property="parameters" column="parameters"/>
<result property="startTimestamp" column="start_timestamp"/>
<result property="endTimestamp" column="end_timestamp"/>
<result property="status" column="status"/>

2
src/main/resources/db/migration/V1.0.01__INIT_TABLES.sql
View File

@@ -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',