From 1d64da41bb2b3c693da1c72ce252ac98359f68f9 Mon Sep 17 00:00:00 2001 From: mianbin Date: Sun, 25 May 2025 14:52:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86ci-common=E7=9A=84?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=EF=BC=8C=E9=87=8C=E9=9D=A2=E6=9C=89=E5=BE=88?= =?UTF-8?q?=E5=A4=9A=E6=B2=A1=E7=94=A8=E7=9A=84=E6=AE=8B=E7=95=99=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E6=9C=9F=E5=88=A0=E9=99=A4=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=8E=B7=E5=8F=96jar=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E7=9A=84=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 5 +- .idea/encodings.xml | 4 +- .idea/jarRepositories.xml | 20 +-- dependencies/.flattened-pom.xml | 16 +++ dependencies/pom.xml | 19 +++ .../spring/SpringBootApplicationHome.java | 123 ++++++++++++++++++ .../SpringBootApplicationHomeTests.java | 19 +++ .../commons/bean/dispatch/package-info.java | 7 - .../ci/commons/bean/engine/package-info.java | 7 - .../commons/bean/work/agent/AgentMessage.java | 44 ------- .../{bean => }/commons/Pagination.java | 2 +- .../{bean => }/commons/PipelineConstants.java | 2 +- .../engine/execute/PipelineDetails.java | 0 .../engine/execute/PipelineRunMsg.java | 0 .../engine/job/TaskExecMessage.java | 0 .../{bean => }/engine/job/TaskInstance.java | 0 .../engine/job/TaskInstanceQuery.java | 0 .../commons/{bean => }/engine/job/Tasks.java | 0 .../{bean => }/engine/job/TasksQuery.java | 0 .../engine/postprocess/Postprocess.java | 0 .../postprocess/PostprocessInstance.java | 0 .../engine/postprocess/PostprocessQuery.java | 0 .../exception/ApplicationException.java | 2 +- .../{bean => }/exception/SystemException.java | 2 +- .../ci/commons/{bean => }/order/Order.java | 2 +- .../{bean => }/order/OrderBuilder.java | 7 +- .../{bean => }/order/OrderBuilders.java | 2 +- .../{bean => }/order/OrderTypeEnum.java | 2 +- .../process/definition/Condition.java | 0 .../process/definition/Pipeline.java | 0 .../process/definition/PipelineFollow.java | 0 .../definition/PipelineFollowQuery.java | 0 .../process/definition/PipelineOpen.java | 0 .../process/definition/PipelineOpenQuery.java | 0 .../process/definition/PipelineQuery.java | 0 .../process/definition/PipelineRecently.java | 0 .../process/definition/Variable.java | 0 .../process/instance/PipelineInstance.java | 0 .../instance/PipelineInstanceQuery.java | 0 .../{bean => }/process/package-info.java | 0 .../{bean => }/process/setting/Auth.java | 0 .../{bean => }/process/setting/AuthHost.java | 0 .../process/setting/AuthHostGroup.java | 0 .../process/setting/AuthHostGroupDetails.java | 0 .../process/setting/AuthHostGroupQuery.java | 0 .../process/setting/AuthHostK8s.java | 0 .../process/setting/AuthHostK8sQuery.java | 0 .../process/setting/AuthHostQuery.java | 0 .../{bean => }/process/setting/AuthThird.java | 0 .../process/setting/AuthThirdQuery.java | 0 .../{bean => }/process/setting/Cache.java | 0 .../{bean => }/process/setting/Env.java | 0 .../{bean => }/process/setting/EnvQuery.java | 0 .../{bean => }/process/setting/Group.java | 0 .../process/setting/GroupQuery.java | 0 .../{bean => }/process/setting/HostGroup.java | 0 .../{bean => }/process/setting/Resources.java | 0 .../process/setting/ResourcesDetails.java | 0 .../{bean => }/process/setting/Scm.java | 0 .../{bean => }/process/setting/ScmQuery.java | 0 .../process/setting/SystemMassage.java | 0 .../{bean => }/process/stage/Stage.java | 0 .../process/stage/StageInstance.java | 0 .../process/stage/StageInstanceQuery.java | 0 .../support/count/PipelineDayCount.java | 0 .../support/count/PipelineDayRateCount.java | 0 .../support/count/PipelineOverview.java | 0 .../support/count/PipelineRunCount.java | 0 .../support/count/PipelineRunCountQuery.java | 0 .../support/count/PipelineRunDayCount.java | 0 .../support/count/PipelineRunResultCount.java | 0 .../support/count/PipelineRunTimeCount.java | 0 .../support/count/PipelineSurveyCount.java | 0 .../count/PipelineSurveyResultCount.java | 0 .../support/count/PipelineTimeCount.java | 0 .../{bean => }/support/deploy/TaskDeploy.java | 0 .../support/deploy/TaskDeployInstance.java | 0 .../deploy/TaskDeployInstanceQuery.java | 0 .../support/deploy/TaskDeployStrategy.java | 0 .../{bean => }/support/package-info.java | 0 .../{bean => }/support/webhook/WebHook.java | 0 .../{bean/jdbc => utils}/JdbcTemplate.java | 2 +- .../{bean => }/utils/PipelineFileUtil.java | 8 +- .../{bean => }/utils/PipelineUtil.java | 4 +- .../ci/commons/{bean => }/utils/Result.java | 2 +- .../ci/commons/work/agent/AgentMessage.java | 16 +++ .../{bean => }/work/agent/AgentQuery.java | 4 +- .../{bean => }/work/agent/model/Agent.java | 0 .../commons/{bean => }/work/package-info.java | 0 modules/module-ci-execute/pom.xml | 40 ++++++ .../java/cd/casic/module/execute/Main.java | 13 ++ .../pom.xml | 2 +- .../src/main/java/cd/casic/ci/store/Main.java | 0 .../module/process/core/util/BeanUtils.java | 2 +- .../appauth/model/ApplyAuthUserQuery.java | 4 +- .../message/model/MessageDmNoticeQuery.java | 4 +- .../model/message/MessageNoticeQuery.java | 4 +- .../model/setting/MessageSendTypeQuery.java | 4 +- .../impl/PipelineFollowServiceImpl.java | 3 +- .../impl/PipelineOpenServiceImpl.java | 3 +- .../definition/impl/PipelineServiceImpl.java | 4 +- .../service/impl/PipelineExecServiceImpl.java | 2 +- .../impl/AuthHostGroupServiceImpl.java | 4 +- .../process/setting/impl/EnvServiceImpl.java | 2 +- .../setting/impl/GroupServiceImpl.java | 1 - .../setting/impl/ResourcesServiceImpl.java | 10 +- .../controller/PostprocessController.java | 2 +- .../service/impl/PostprocessServiceImpl.java | 2 +- .../process/support/trigger/quartz/Job.java | 2 +- .../support/trigger/service/CronUtils.java | 4 +- .../service/impl/TriggerServiceImpl.java | 2 +- .../service/impl/TriggerTimeServiceImpl.java | 2 +- .../util/impl/PipelineUtilServiceImpl.java | 6 +- .../util/util/PipelineRequestUtil.java | 4 +- .../service/impl/VariableServiceImpl.java | 2 +- .../artifact/model/XpackRepositoryQuery.java | 4 +- .../impl/TaskArtifactXpackServiceImpl.java | 2 +- .../PipelineCodeGitHubController.java | 2 +- .../PipelineCodeGitLabController.java | 2 +- .../PipelineCodeGiteeController.java | 2 +- .../PipelineCodeGittokController.java | 2 +- .../PipelineCodePriGitLabController.java | 2 +- .../process/task/code/jpa/JpaTemplate.java | 4 +- .../impl/TaskCodeGitHubServiceImpl.java | 5 +- .../impl/TaskCodeGitLabServiceImpl.java | 5 +- .../impl/TaskCodeGiteeServiceImpl.java | 4 +- .../impl/TaskCodeGittokServiceImpl.java | 5 +- .../impl/TaskCodePriGitLabServiceImpl.java | 4 +- .../service/impl/TaskCodeServiceImpl.java | 6 +- .../controller/SpotbugsScanController.java | 5 +- .../task/codescan/dao/SpotbugsScanDao.java | 3 - .../task/codescan/model/SpotbugsBugQuery.java | 4 +- .../service/impl/SpotbugsXmlConfig.java | 6 +- .../service/impl/TaskCodeScanServiceImpl.java | 2 +- .../task/service/TasksExecServiceImpl.java | 2 +- .../service/TasksInstanceServiceImpl.java | 4 +- .../task/test/model/MavenTestQuery.java | 4 +- .../task/test/model/RelevanceTestOnQuery.java | 4 +- .../task/test/model/TestOnApiEnvQuery.java | 4 +- .../task/test/model/TestOnAppEnvQuery.java | 4 +- .../TestOnPlanCaseInstanceBindQuery.java | 4 +- .../task/test/model/TestOnPlanQuery.java | 4 +- .../task/test/model/TestOnWebEnvQuery.java | 4 +- .../process/toolkit/beans/BeanMapper.java | 2 +- .../beans/metadata/BeanMapperRegister.java | 2 +- .../ws/server/SocketServerHandler.java | 5 +- .../impl/WebSocketMessageServiceImpl.java | 4 +- modules/pom.xml | 1 + ops-server/pom.xml | 6 +- pom.xml | 2 +- 150 files changed, 372 insertions(+), 202 deletions(-) create mode 100644 framework/commons/src/main/java/cd/casic/framework/commons/util/spring/SpringBootApplicationHome.java create mode 100644 framework/commons/src/test/java/collection/SpringBootApplicationHomeTests.java delete mode 100644 modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/dispatch/package-info.java delete mode 100644 modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/engine/package-info.java delete mode 100644 modules/module-ci-commons/src/main/java/cd/casic/ci/commons/bean/work/agent/AgentMessage.java rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/commons/Pagination.java (92%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/commons/PipelineConstants.java (99%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/execute/PipelineDetails.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/execute/PipelineRunMsg.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/job/TaskExecMessage.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/job/TaskInstance.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/job/TaskInstanceQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/job/Tasks.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/job/TasksQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/postprocess/Postprocess.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/postprocess/PostprocessInstance.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/engine/postprocess/PostprocessQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/exception/ApplicationException.java (90%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/exception/SystemException.java (84%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/order/Order.java (84%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/order/OrderBuilder.java (70%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/order/OrderBuilders.java (94%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/order/OrderTypeEnum.java (77%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/Condition.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/Pipeline.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/PipelineFollow.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/PipelineFollowQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/PipelineOpen.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/PipelineOpenQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/PipelineQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/PipelineRecently.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/definition/Variable.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/instance/PipelineInstance.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/instance/PipelineInstanceQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/package-info.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/Auth.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthHost.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthHostGroup.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthHostGroupDetails.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthHostGroupQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthHostK8s.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthHostK8sQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthHostQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthThird.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/AuthThirdQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/Cache.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/Env.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/EnvQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/Group.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/GroupQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/HostGroup.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/Resources.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/ResourcesDetails.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/Scm.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/ScmQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/setting/SystemMassage.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/stage/Stage.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/stage/StageInstance.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/process/stage/StageInstanceQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineDayCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineDayRateCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineOverview.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineRunCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineRunCountQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineRunDayCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineRunResultCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineRunTimeCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineSurveyCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineSurveyResultCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/count/PipelineTimeCount.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/deploy/TaskDeploy.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/deploy/TaskDeployInstance.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/deploy/TaskDeployInstanceQuery.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/deploy/TaskDeployStrategy.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/package-info.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/support/webhook/WebHook.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean/jdbc => utils}/JdbcTemplate.java (93%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/utils/PipelineFileUtil.java (97%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/utils/PipelineUtil.java (99%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/utils/Result.java (97%) create mode 100644 modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/agent/AgentMessage.java rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/work/agent/AgentQuery.java (81%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/work/agent/model/Agent.java (100%) rename modules/module-ci-commons/src/main/java/cd/casic/ci/commons/{bean => }/work/package-info.java (100%) create mode 100644 modules/module-ci-execute/pom.xml create mode 100644 modules/module-ci-execute/src/main/java/cd/casic/module/execute/Main.java rename modules/{module-ci-store => module-ci-market}/pom.xml (94%) rename modules/{module-ci-store => module-ci-market}/src/main/java/cd/casic/ci/store/Main.java (100%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0f3f9116..d24abdb3 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -28,6 +28,7 @@ + @@ -39,7 +40,6 @@ - @@ -71,10 +71,11 @@ + + - diff --git a/.idea/encodings.xml b/.idea/encodings.xml index bbfbfb10..85aa9669 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -61,6 +61,8 @@ + + @@ -83,8 +85,6 @@ - - diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 1945c076..1ae4942f 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,16 +1,16 @@ - - + + - - + +