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

fix: ASW-176 job 支持 playbook param 参数

Browse Source
This commit is contained in:
zhangshuai
2024-11-18 16:46:28 +08:00
parent a83da4f1bb
commit fd9f1cb7e4
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,10 @@ public class JobPlaybookExecutor extends QuartzJobBean {
.set(JobEntity::getEndTimestamp, System.currentTimeMillis()) .set(JobEntity::getEndTimestamp, System.currentTimeMillis())
.eq(JobEntity::getId, job.getId())); .eq(JobEntity::getId, job.getId()));
} }
// remove session
environmentService.removeSession(session.getId());
log.info("[playbookExecutor] [request env exec playbook error] [job id: {}]", job.getId());
} }
}); });
} }
@@ -154,7 +158,15 @@ public class JobPlaybookExecutor extends QuartzJobBean {
PackageEntity packageEntity = packageService.getById(packageId); PackageEntity packageEntity = packageService.getById(packageId);
File packageFile = T.FileUtil.file(packageEntity.getPath()); File packageFile = T.FileUtil.file(packageEntity.getPath());
String packageName = packageEntity.getIdentifier(); String packageName = packageEntity.getIdentifier();
String playbookParam = job.getPlaybookParam();
Map<String, Object> params = T.MapUtil.newHashMap();
if (T.StrUtil.isNotEmpty(playbookParam)) {
params = T.JSONUtil.toBean(playbookParam, Map.class);
}else {
params.put("reInstall", true);
params.put("clearCache", true);
params.put("unInstall", true);
}
PlaybookEntity playbook = playbookService.getById(playbookId); PlaybookEntity playbook = playbookService.getById(playbookId);
File playbookFile = T.FileUtil.file(playbook.getPath()); File playbookFile = T.FileUtil.file(playbook.getPath());
@@ -170,7 +182,9 @@ public class JobPlaybookExecutor extends QuartzJobBean {
request.form("id", job.getId()); request.form("id", job.getId());
request.form("packageName", packageName); request.form("packageName", packageName);
request.header("Authorization", token); request.header("Authorization", token);
for (Map.Entry<String, Object> param : params.entrySet()) {
request.form(param.getKey(), param.getValue());
}
HttpResponse response = request.execute(); HttpResponse response = request.execute();
return response; return response;
} finally { } finally {