diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java index 59f69f20..9bd0e6e3 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java @@ -127,11 +127,10 @@ public class ApplicationWorker extends HttpWorker { JSONObject data = response.getJSONObject("data"); Integer scaTaskId = data.getInteger("scaTaskId"); - //更新xmTraceId数据到task表 - applicationConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); + //更新scaTaskId数据到task表 + applicationConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(applicationConfigInfo); pipTaskDao.updateById(pipTask); - pollTaskStatus(restTemplate, scaTaskId); } else if (message.equals("应用已经存在")) { append(context,message); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java index 2ca3352f..aba751c2 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java @@ -99,11 +99,10 @@ public class CodingWorker extends HttpWorker { JSONObject data = response.getJSONObject("data"); Integer scaTaskId = data.getInteger("scaTaskId"); - //更新xmTraceId数据到task表 - codingConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); + //更新scaTaskId数据到task表 + codingConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(codingConfigInfo); pipTaskDao.updateById(pipTask); - //轮询请求状态 pollTaskStatus(restTemplate, scaTaskId); } else if (response.getString("message").equals("应用已经存在")){ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java index 85afce9a..a8dd4372 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java @@ -135,8 +135,8 @@ public class ScaBinaryWorker extends HttpWorker { JSONObject data = response.getJSONObject("data"); Integer scaTaskId = data.getInteger("scaTaskId"); - //更新xmTraceId数据到task表 - scaBinaryConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); + //更新scaTaskId数据到task表 + scaBinaryConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(scaBinaryConfigInfo); pipTaskDao.updateById(pipTask); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java index 87f3e439..5637ad55 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java @@ -132,8 +132,8 @@ public class ScaMirrorWorker extends HttpWorker { JSONObject data = response.getJSONObject("data"); Integer scaTaskId = data.getInteger("scaTaskId"); - //更新xmTraceId数据到task表 - scaMirrorConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); + //更新scaTaskId数据到task表 + scaMirrorConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(scaMirrorConfigInfo); pipTaskDao.updateById(pipTask); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java index 69cea733..75b5e612 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java @@ -129,8 +129,8 @@ public class ScaSbomWorker extends HttpWorker { JSONObject data = response.getJSONObject("data"); Integer scaTaskId = data.getInteger("scaTaskId"); - //更新xmTraceId数据到task表 - scaSbomConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); + //更新scaTaskId数据到task表 + scaSbomConfigInfo.put("scaTaskId",scaTaskId); pipTask.setTaskProperties(scaSbomConfigInfo); pipTaskDao.updateById(pipTask); diff --git a/ops-server/pom.xml b/ops-server/pom.xml index 26b2b397..33b28865 100644 --- a/ops-server/pom.xml +++ b/ops-server/pom.xml @@ -11,8 +11,8 @@ ops-server - jar - + + war ${project.artifactId}