diff --git a/dependencies/.flattened-pom.xml b/dependencies/.flattened-pom.xml deleted file mode 100644 index fa311514..00000000 --- a/dependencies/.flattened-pom.xml +++ /dev/null @@ -1,672 +0,0 @@ - - - 4.0.0 - cd.casic.boot - dependencies - 2.0.0-jdk17 - pom - dependencies - 管理整个项目的依赖版本 - - 2.9.2 - 8.0.0.RELEASE - 1.6.0 - 5.1.0 - 1.6.2 - 1.2.83 - 3.47.1.0 - 3.5.16 - 0.33.0 - 2.9.3 - 20250107 - 8.6.0 - 1.27.1 - 2.3.1 - 2.7.0 - 4.3.1 - 3.36.0 - 0.9.0 - 2.14.5 - 1.28 - 3.3.4 - 1.80 - 2.3.0 - 1.12 - 2.2.7 - 2.17.0 - 1.5.8 - 2.6.10 - 3.4.7 - 6.0.0-M16 - 2.3.0 - 1.18.1 - 3.5.8 - 4.5.0 - 1.18.34 - 9.0.0 - 5.2.0 - 1.5.8 - 1.4.0 - 2.4 - 0.10.2 - 3.0.6 - 2.0.8.3 - 3.12.1 - 1.2.13 - 0.12.0 - 1.4.13 - 5.8.32 - 2.0.0-jdk17 - 0.1.55 - 1.28 - 42.7.4 - 3.3.3 - 23.5.0.24.07 - 4.1.113.Final - 6.6.5 - 1.1.4 - 33.3.1-jre - 1.12.777 - 3.11.1 - 1.7.8 - 4.0.3 - 1.5.6 - 1.2.23 - 3.0.6 - 8.1.3.140 - - - - - io.netty - netty-bom - ${netty.version} - pom - import - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - cd.casic.boot - commons - ${revision} - - - cd.casic.boot - spring-boot-starter-biz-data-permission - ${revision} - - - cd.casic.boot - spring-boot-starter-biz-ip - ${revision} - - - cd.casic.boot - spring-boot-starter-biz-tenant - ${revision} - - - cd.casic.boot - spring-boot-starter-excel - ${revision} - - - cd.casic.boot - spring-boot-starter-job - ${revision} - - - cd.casic.boot - spring-boot-starter-mongo - ${revision} - - - cd.casic.boot - spring-boot-starter-monitor - ${revision} - - - cd.casic.boot - spring-boot-starter-mq - ${revision} - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - - - cd.casic.boot - spring-boot-starter-mybatis - ${revision} - - - cd.casic.boot - spring-boot-starter-protection - ${revision} - - - cd.casic.boot - spring-boot-starter-redis - ${revision} - - - cd.casic.boot - spring-boot-starter-security - ${revision} - - - cd.casic.boot - spring-boot-starter-test - ${revision} - - - cd.casic.boot - spring-boot-starter-web - ${revision} - - - cd.casic.boot - spring-boot-starter-websocket - ${revision} - - - cd.casic.boot - module-infra-api - ${revision} - - - cd.casic.boot - module-infra-biz - ${revision} - - - cd.casic.boot - module-system-api - ${revision} - - - cd.casic.boot - module-system-biz - ${revision} - - - cd.casic.boot - module-ci-process-api - ${revision} - - - cd.casic.boot - module-ci-process-biz - ${revision} - - - cd.casic.boot - module-ci-commons - ${revision} - - - cd.casic.boot - module-ci-environment - ${revision} - - - cd.casic.boot - module-ci-event - ${revision} - - - cd.casic.boot - module-ci-log - ${revision} - - - cd.casic.boot - module-ci-market - ${revision} - - - cd.casic.boot - module-ci-project - ${revision} - - - cd.casic.boot - module-ci-quality - ${revision} - - - cd.casic.boot - module-ci-ticket - ${revision} - - - cd.casic.boot - module-ci-repository - ${revision} - - - cd.casic.boot - module-ci-worker - ${revision} - - - cd.casic.boot - module-ci-dispatch-api - ${revision} - - - cd.casic.boot - module-ci-store-api - ${revision} - - - cd.casic.boot - module-ci-execute - ${revision} - - - io.github.mouzt - bizlog-sdk - ${bizlog-sdk.version} - - - org.springframework.boot - spring-boot-starter - - - - - org.springframework.boot - spring-boot-configuration-processor - ${spring.boot.version} - - - com.github.xiaoymin - knife4j-openapi3-jakarta-spring-boot-starter - ${knife4j.version} - - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${springdoc.version} - - - com.alibaba - druid-spring-boot-3-starter - ${druid.version} - - - org.mybatis - mybatis - ${mybatis.version} - - - com.baomidou - mybatis-plus-spring-boot3-starter - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-generator - ${mybatis-plus.version} - - - com.baomidou - dynamic-datasource-spring-boot3-starter - ${dynamic-datasource.version} - - - com.github.yulichang - mybatis-plus-join-boot-starter - ${mybatis-plus-join.version} - - - com.fhs-opensource - easy-trans-spring-boot-starter - ${easy-trans.version} - - - org.springframework - spring-context - - - org.springframework.cloud - spring-cloud-commons - - - - - com.fhs-opensource - easy-trans-mybatis-plus-extend - ${easy-trans.version} - - - com.fhs-opensource - easy-trans-anno - ${easy-trans.version} - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - org.redisson - redisson-spring-boot-starter - - - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - io.opentracing - opentracing-api - ${opentracing.version} - - - io.opentracing - opentracing-util - ${opentracing.version} - - - io.opentracing - opentracing-noop - ${opentracing.version} - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-server-cloud - - - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - org.mockito - mockito-inline - ${mockito-inline.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - - - org.ow2.asm - asm - - - org.mockito - mockito-core - - - - - com.github.fppt - jedis-mock - ${jedis-mock.version} - - - uk.co.jemos.podam - podam - ${podam.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - cn.hutool - hutool-all - ${hutool-5.version} - - - org.dromara.hutool - hutool-extra - ${hutool-6.version} - - - com.alibaba - easyexcel - ${easyexcel.verion} - - - commons-io - commons-io - ${commons-io.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - org.apache.tika - tika-core - ${tika-core.version} - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - com.alibaba - fastjson - ${fastjson.version} - - - com.networknt - json-schema-validator - ${json.schema.validator.veresion} - - - org.json - json - ${json.version} - - - com.google.guava - guava - ${guava.version} - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - commons-net - commons-net - ${commons-net.version} - - - com.jcraft - jsch - ${jsch.version} - - - com.amazonaws - aws-java-sdk-s3 - ${aws-java-sdk-s3.version} - - - org.lionsoul - ip2region - ${ip2region.version} - - - org.jsoup - jsoup - ${jsoup.version} - - - com.github.oshi - oshi-core - ${oshi-version} - - - org.pf4j - pf4j - ${pf4j.version} - - - org.slf4j - slf4j-log4j12 - - - - - io.cloudsoft.windows - winrm4j - ${winrm4j.version} - - - com.dameng - DmJdbcDriver18 - ${dm8.jdbc.version} - - - com.oracle.database.jdbc - ojdbc8 - ${oracle.version} - - - org.postgresql - postgresql - ${postgresql.version} - - - org.opengauss - opengauss-jdbc - ${opengauss.jdbc.version} - - - cn.com.kingbase - kingbase8 - ${kingbase.jdbc.version} - - - org.xerial - sqlite-jdbc - ${sqlite.version} - - - com.gitee.anwena - mongo-plus-boot-starter - ${anwena.version} - - - org.bouncycastle - bcprov-jdk18on - ${bcprov-jdk18on.version} - - - org.jvnet.winp - winp - ${winp.version} - - - org.reflections - reflections - ${reflections.version} - - - org.apache.commons - commons-exec - ${commons-exec.version} - - - com.googlecode.plist - dd-plist - ${dd-plist.version} - - - net.dongliu - apk-parser - ${apk-parser.version} - - - ch.qos.logback - logback-core - ${logback-core.version} - - - ch.qos.logback - logback-classic - ${logback-classic.version} - - - com.github.ben-manes.caffeine - caffeine - ${caffeine.version} - - - io.github.resilience4j - resilience4j-circuitbreaker - ${resilience4j-circuitbreaker.version} - - - ognl - ognl - ${ognl.version} - - - - diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java index d6b81c91..664d3c05 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java @@ -15,6 +15,7 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; @@ -117,7 +118,9 @@ public class MemoryLogManager implements LoggerManager { } } } + @Transactional public void flushMemory(List taskContextList){ + log.info("流水线日志开始入库"); List insertList = new ArrayList<>(); List updateList = new ArrayList<>(); for (TaskRunContext taskRunContext : taskContextList) { 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..eefc88ce 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,15 +127,14 @@ 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); - Integer oldScaTaskId = (Integer) applicationConfigInfo.get("taskId"); + Integer oldScaTaskId = (Integer) applicationConfigInfo.get("scaTaskId"); Integer oldApplicationId = (Integer) applicationConfigInfo.get("applicationId"); int restartResult = reStartTask(restTemplate, oldApplicationId); if (restartResult != 0) { 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..d67652f9 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,16 +99,15 @@ 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("应用已经存在")){ append(context,response.getString("message")); - Integer oldScaTaskId = (Integer) codingConfigInfo.get("taskId"); + Integer oldScaTaskId = (Integer) codingConfigInfo.get("scaTaskId"); Integer oldApplicationId = (Integer) codingConfigInfo.get("applicationId"); int restartResult = reStartTask(restTemplate, oldApplicationId); if (restartResult != 0) { 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..9d2eb42e 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,15 +135,15 @@ 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); pollTaskStatus(restTemplate, scaTaskId); } else if (message.equals("应用已经存在")) { append(context,message); - Integer oldScaTaskId = (Integer) scaBinaryConfigInfo.get("taskId"); + Integer oldScaTaskId = (Integer) scaBinaryConfigInfo.get("scaTaskId"); Integer oldApplicationId = (Integer) scaBinaryConfigInfo.get("applicationId"); int restartResult = reStartTask(restTemplate, oldApplicationId); if (restartResult != 0) { 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..f33f397a 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,15 +132,15 @@ 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); pollTaskStatus(restTemplate, scaTaskId); } else if (message.equals("应用已经存在")) { append(context,message); - Integer oldScaTaskId = (Integer) scaMirrorConfigInfo.get("taskId"); + Integer oldScaTaskId = (Integer) scaMirrorConfigInfo.get("scaTaskId"); Integer oldApplicationId = (Integer) scaMirrorConfigInfo.get("applicationId"); int restartResult = reStartTask(restTemplate, oldApplicationId); if (restartResult != 0) { 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..b68bde7b 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,15 +129,15 @@ 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); pollTaskStatus(restTemplate, scaTaskId); } else if (message.equals("应用已经存在")) { append(context,message); - Integer oldScaTaskId = (Integer) scaSbomConfigInfo.get("taskId"); + Integer oldScaTaskId = (Integer) scaSbomConfigInfo.get("scaTaskId"); Integer oldApplicationId = (Integer) scaSbomConfigInfo.get("applicationId"); int restartResult = reStartTask(restTemplate, oldApplicationId); if (restartResult != 0) { diff --git a/ops-server/pom.xml b/ops-server/pom.xml index 26b2b397..d719503a 100644 --- a/ops-server/pom.xml +++ b/ops-server/pom.xml @@ -11,8 +11,8 @@ ops-server + jar - ${project.artifactId} diff --git a/ops-server/src/test/java/cd/casic/server/FileDownLoadTest.java b/ops-server/src/test/java/cd/casic/server/FileDownLoadTest.java new file mode 100644 index 00000000..00dff4d2 --- /dev/null +++ b/ops-server/src/test/java/cd/casic/server/FileDownLoadTest.java @@ -0,0 +1,34 @@ +package cd.casic.server; + +import cd.casic.ci.process.process.dataObject.base.BaseIdReq; +import cd.casic.ci.process.process.service.report.ReportService; +import cn.hutool.core.codec.Base64; +import jakarta.annotation.Resource; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ActiveProfiles; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.ArrayList; + +@SpringBootTest(classes = {OpsServerApplication.class}) +@ActiveProfiles("local") +public class FileDownLoadTest { +// "D:\博彦科技-项目相关\ops-pro\ops-server\src\main\resources" + @Resource + private ReportService reportService; + @Test + public void test01() throws Exception { + BaseIdReq baseIdReq = new BaseIdReq(); + ArrayList ids = new ArrayList<>(3); + ids.add(28); + baseIdReq.setReportIds(ids); + ResponseEntity response = reportService.downLoadReport(baseIdReq); + byte[] bytes = Base64.decode(response.getBody()); + File file = new File("D:/博彦科技-项目相关/ops-pro/ops-server/src/main/resources/test.xlsx"); + FileOutputStream fos = new FileOutputStream(file); + fos.write(bytes); + } +}