mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scataskId回写

Browse Source
This commit is contained in:
even 2025-06-07 16:42:23 +08:00
parent 4017f96914
commit 4955e824bd
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ApplicationWorker.java
View File

@ -127,11 +127,10 @@ public class ApplicationWorker extends HttpWorker {
JSONObject data = response.getJSONObject("data"); JSONObject data = response.getJSONObject("data");
Integer scaTaskId = data.getInteger("scaTaskId"); Integer scaTaskId = data.getInteger("scaTaskId");
//更新xmTraceId数据到task表 //更新scaTaskId数据到task表
applicationConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); applicationConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(applicationConfigInfo); pipTask.setTaskProperties(applicationConfigInfo);
pipTaskDao.updateById(pipTask); pipTaskDao.updateById(pipTask);
pollTaskStatus(restTemplate, scaTaskId); pollTaskStatus(restTemplate, scaTaskId);
} else if (message.equals("应用已经存在")) { } else if (message.equals("应用已经存在")) {
append(context,message); append(context,message);

5
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/CodingWorker.java
View File

@ -99,11 +99,10 @@ public class CodingWorker extends HttpWorker {
JSONObject data = response.getJSONObject("data"); JSONObject data = response.getJSONObject("data");
Integer scaTaskId = data.getInteger("scaTaskId"); Integer scaTaskId = data.getInteger("scaTaskId");
//更新xmTraceId数据到task表 //更新scaTaskId数据到task表
codingConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); codingConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(codingConfigInfo); pipTask.setTaskProperties(codingConfigInfo);
pipTaskDao.updateById(pipTask); pipTaskDao.updateById(pipTask);
//轮询请求状态 //轮询请求状态
pollTaskStatus(restTemplate, scaTaskId); pollTaskStatus(restTemplate, scaTaskId);
} else if (response.getString("message").equals("应用已经存在")){ } else if (response.getString("message").equals("应用已经存在")){

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaBinaryWorker.java
View File

@ -135,8 +135,8 @@ public class ScaBinaryWorker extends HttpWorker {
JSONObject data = response.getJSONObject("data"); JSONObject data = response.getJSONObject("data");
Integer scaTaskId = data.getInteger("scaTaskId"); Integer scaTaskId = data.getInteger("scaTaskId");
//更新xmTraceId数据到task表 //更新scaTaskId数据到task表
scaBinaryConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); scaBinaryConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(scaBinaryConfigInfo); pipTask.setTaskProperties(scaBinaryConfigInfo);
pipTaskDao.updateById(pipTask); pipTaskDao.updateById(pipTask);

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaMirrorWorker.java
View File

@ -132,8 +132,8 @@ public class ScaMirrorWorker extends HttpWorker {
JSONObject data = response.getJSONObject("data"); JSONObject data = response.getJSONObject("data");
Integer scaTaskId = data.getInteger("scaTaskId"); Integer scaTaskId = data.getInteger("scaTaskId");
//更新xmTraceId数据到task表 //更新scaTaskId数据到task表
scaMirrorConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); scaMirrorConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(scaMirrorConfigInfo); pipTask.setTaskProperties(scaMirrorConfigInfo);
pipTaskDao.updateById(pipTask); pipTaskDao.updateById(pipTask);

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/ScaSbomWorker.java
View File

@ -129,8 +129,8 @@ public class ScaSbomWorker extends HttpWorker {
JSONObject data = response.getJSONObject("data"); JSONObject data = response.getJSONObject("data");
Integer scaTaskId = data.getInteger("scaTaskId"); Integer scaTaskId = data.getInteger("scaTaskId");
//更新xmTraceId数据到task表 //更新scaTaskId数据到task表
scaSbomConfigInfo.put("xmTraceId",response.getJSONObject("xmTraceId").toString()); scaSbomConfigInfo.put("scaTaskId",scaTaskId);
pipTask.setTaskProperties(scaSbomConfigInfo); pipTask.setTaskProperties(scaSbomConfigInfo);
pipTaskDao.updateById(pipTask); pipTaskDao.updateById(pipTask);

4
ops-server/pom.xml
View File

@ -11,8 +11,8 @@
<artifactId>ops-server</artifactId> <artifactId>ops-server</artifactId>
<packaging>jar</packaging> <!-- <packaging>jar</packaging>-->
<packaging>war</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description> <description>