From c9178ea89e9d07722d0a623e01b121ef76adced4 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 18 Jul 2024 09:28:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF):=E5=90=AF=E5=8A=A8=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsCiPipelinesController.java | 18 +++++++++++++++--- .../service/IPmsCiPipelinesService.java | 2 ++ .../impl/PmsCiPipelinesServiceImpl.java | 12 ++++++++++++ .../pms/utils/PmsGitLinkRequestUrl.java | 4 ++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java index 9dbcf02bc..60b74d206 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java @@ -205,13 +205,25 @@ public class PmsCiPipelinesController extends BaseController } /** - * 重启流水线执行记录任务 + * 启动流水线执行记录任务 */ @PostMapping(value = "/{id}/actions/runs/{run}/jobs/{job}/rerun") + @ApiOperation("启动流水线执行记录任务") + public AjaxResult runPipelineRunsJob(@ApiParam(name = "id", value = "流水线id") @PathVariable Long id, + @ApiParam(name = "workflow", value = "流水线文件名称", required = true) @RequestParam String workflow, + @ApiParam(name = "ref", value = "分支名称", required = true) @RequestParam String ref) + { + return success(pmsCiPipelinesService.runPipelineRunsJob(id, workflow, ref)); + } + + /** + * 重启流水线执行记录任务 + */ + @PostMapping(value = "/{id}/actions/runs") @ApiOperation("重启流水线执行记录任务") public AjaxResult reRunPipelineRunsJob(@ApiParam(name = "id", value = "流水线id")@PathVariable Long id, - @ApiParam(name = "run", value = "执行记录序号")@PathVariable String run, - @ApiParam(name = "job", value = "执行任务序号")@PathVariable String job) + @ApiParam(name = "run", value = "执行记录序号")@PathVariable String run, + @ApiParam(name = "job", value = "执行任务序号")@PathVariable String job) { return success(pmsCiPipelinesService.reRunPipelineRunsJob(id, run, job)); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java index a2f866724..ce3e38f87 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelinesService.java @@ -96,4 +96,6 @@ public interface IPmsCiPipelinesService JSONObject reRunAllJobsInPipelineRun(Long id, String run); void getPipelineRunJobLogs(Long id, String run, String job, HttpServletResponse response); + + JSONObject runPipelineRunsJob(Long id, String workflow, String ref); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java index 5d5c3e29f..1f300c795 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java @@ -376,6 +376,18 @@ public class PmsCiPipelinesServiceImpl implements IPmsCiPipelinesService { job), null); } + @Override + public JSONObject runPipelineRunsJob(Long id, String workflow, String ref) { + PmsCiPipelines pmsCiPipelines = pmsCiPipelinesMapper.selectPmsCiPipelinesById(id); + if (pmsCiPipelines == null) { + throw new ServiceException("该项目流水线不存在(流水线ID[%s])", id); + } + return gitLinkRequestHelper.doPost(PmsGitLinkRequestUrl.RUN_PIPELINE_RUNS_JOB(pmsCiPipelines.getOwner(), + pmsCiPipelines.getRepoIdentifier(), + workflow, + ref), null); + } + @Override public JSONObject reRunAllJobsInPipelineRun(Long id, String run) { PmsCiPipelines pmsCiPipelines = pmsCiPipelinesMapper.selectPmsCiPipelinesById(id); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java index 124fd0281..6cf1fa4ae 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java @@ -368,6 +368,10 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { return getGitLinkRequestUrl(String.format("/api/v1/%s/%s/actions/runs/%s/jobs/%s/rerun", owner, repoIdentifier, run, job)); } + public static GitLinkRequestUrl RUN_PIPELINE_RUNS_JOB(String owner, String repoIdentifier, String workflow, String ref){ + return getGitLinkRequestUrl(String.format("/api/v1/{owner}/{repo}/actions/runs?workflow=%s&ref=%s", owner, repoIdentifier, workflow, ref)); + } + public static GitLinkRequestUrl RERUN_ALL_JOBS_IN_PIPELINE_RUN(String owner, String repoIdentifier, String run){ return getGitLinkRequestUrl(String.format("/api/v1/%s/%s/actions/runs/%s/rerun", owner, repoIdentifier, run)); } From ae14fb47d16e1813384faf65faa3ee366b2bb38c Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 18 Jul 2024 14:37:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF):=E5=90=AF=E5=8A=A8=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1url=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pipeline/controller/PmsCiPipelinesController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java index 60b74d206..3aff4746a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java @@ -207,7 +207,7 @@ public class PmsCiPipelinesController extends BaseController /** * 启动流水线执行记录任务 */ - @PostMapping(value = "/{id}/actions/runs/{run}/jobs/{job}/rerun") + @PostMapping(value = "/{id}/actions/runs/run") @ApiOperation("启动流水线执行记录任务") public AjaxResult runPipelineRunsJob(@ApiParam(name = "id", value = "流水线id") @PathVariable Long id, @ApiParam(name = "workflow", value = "流水线文件名称", required = true) @RequestParam String workflow, @@ -219,7 +219,7 @@ public class PmsCiPipelinesController extends BaseController /** * 重启流水线执行记录任务 */ - @PostMapping(value = "/{id}/actions/runs") + @PostMapping(value = "/{id}/actions/runs/{run}/jobs/{job}/rerun") @ApiOperation("重启流水线执行记录任务") public AjaxResult reRunPipelineRunsJob(@ApiParam(name = "id", value = "流水线id")@PathVariable Long id, @ApiParam(name = "run", value = "执行记录序号")@PathVariable String run, From 40f4c917ce2cbdeb8b29f86344c186256bba6feb Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 18 Jul 2024 15:02:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF):=E5=90=AF=E5=8A=A8=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java index 6cf1fa4ae..c987dab56 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/utils/PmsGitLinkRequestUrl.java @@ -369,7 +369,7 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { } public static GitLinkRequestUrl RUN_PIPELINE_RUNS_JOB(String owner, String repoIdentifier, String workflow, String ref){ - return getGitLinkRequestUrl(String.format("/api/v1/{owner}/{repo}/actions/runs?workflow=%s&ref=%s", owner, repoIdentifier, workflow, ref)); + return getGitLinkRequestUrl(String.format("/api/v1/%s/%s/actions/runs?workflow=%s&ref=%s", owner, repoIdentifier, workflow, ref)); } public static GitLinkRequestUrl RERUN_ALL_JOBS_IN_PIPELINE_RUN(String owner, String repoIdentifier, String run){ From 6c315b4a150671a96f8c6a360ad55c183b289d82 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 26 Jul 2024 17:21:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix(=E5=AE=89=E5=85=A8=E9=97=AE=E9=A2=98):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E8=AF=A5=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AF=86=E7=A0=81=E4=BF=A1=E6=81=AF=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../microservices/system/controller/SysUserController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java index 721bbda8e..96d09a31b 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java @@ -1,6 +1,7 @@ package com.microservices.system.controller; import com.microservices.common.core.domain.R; +import com.microservices.common.core.exception.ServiceException; import com.microservices.common.core.utils.StringUtils; import com.microservices.common.core.utils.poi.ExcelUtil; import com.microservices.common.core.web.controller.BaseController; @@ -238,8 +239,12 @@ public class SysUserController extends BaseController { */ @GetMapping("getInfo") public AjaxResult getInfo() { - SysUser user = userService.selectUserById(SecurityUtils.getUserId()); SysUserDeptRole userIdentity = SecurityUtils.getUserIdentity(); + if (userIdentity == null) { + throw new ServiceException("当前组织不存在或无权限访问"); + } + SysUser user = userService.selectUserById(SecurityUtils.getUserId()); + user.setPassword(null); // 角色集合 Set roles = tokenService.getRolePermissions(); // 权限集合 From ffc88d721cc4084f31b5ea970b182701b029a172 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 22 Aug 2024 11:25:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF):=E5=B7=B2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=A8=E9=83=A8=E4=BB=93=E5=BA=93=E5=BC=80?= =?UTF-8?q?=E5=90=AFaction=EF=BC=8C=E6=97=A0=E9=9C=80=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=90=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java index 1f300c795..e7a758018 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java @@ -123,7 +123,6 @@ public class PmsCiPipelinesServiceImpl implements IPmsCiPipelinesService { checkPipelineExistence(pmsCiPipelinesInputVo); PmsCiPipelines pmsCiPipelines = buildPmsCiPipelines(pmsCiPipelinesInputVo, enterpriseIdentifier); pmsCiPipelinesMapper.insertPmsCiPipelines(pmsCiPipelines); - openRepoActionModule(pmsCiPipelines.getOwner(), pmsCiPipelines.getRepoIdentifier()); JSONObject result = new JSONObject(); result.put("id", pmsCiPipelines.getId()); return result; From e8487aed64c1012586f42de79b4df8a1550858de Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 22 Aug 2024 11:26:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE):=20#5402=20?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=88=90=E5=91=98=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PmsCommonAsyncServiceImpl.java | 18 ++++++++++-------- .../service/impl/PmsProjectServiceImpl.java | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java index 61d9448b0..4f905b782 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java @@ -18,6 +18,7 @@ import com.microservices.pms.enums.ProjectIssueStatus; import com.microservices.pms.product.domain.PmsProductRequirement; import com.microservices.pms.product.service.IPmsProductRequirementService; import com.microservices.pms.project.domain.*; +import com.microservices.pms.project.domain.vo.PmsProjectInputVo; import com.microservices.pms.project.domain.vo.PmsProjectIssuesInputVo; import com.microservices.pms.project.domain.vo.PmsProjectTestReportInputVo; import com.microservices.pms.project.domain.vo.PmsProjectTestsheetCaseInputVo; @@ -82,6 +83,9 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { @Autowired @Lazy private IPmsProductRequirementService pmsProductRequirementService; + @Autowired + @Lazy + private IPmsProjectService pmsProjectService; private static final String INITIALIZE_NAME = "【示例%s】研发示例%s"; @@ -423,14 +427,12 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { } private Long initializePmsProject(Long id, Long creatorGitLinkUserId) { - PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseById(id); - PmsProject pmsProject = new PmsProject(); - pmsProject.setPmsEnterpriseId(id); + // 创建项目 + PmsProjectInputVo pmsProjectInputVo = new PmsProjectInputVo(); + pmsProjectInputVo.setPmsEnterpriseId(id); String name = "项目"; - pmsProject.setProjectName(String.format(INITIALIZE_NAME, name, name)); - pmsProject.setProjectAssigneeId(creatorGitLinkUserId); - pmsProject.setDeptId(pmsEnterprise.getDeptId()); - pmsProjectMapper.insertPmsProject(pmsProject); - return pmsProject.getId(); + pmsProjectInputVo.setProjectName(String.format(INITIALIZE_NAME, name, name)); + pmsProjectInputVo.setProjectAssigneeId(creatorGitLinkUserId); + return (long) pmsProjectService.insertPmsProject(pmsProjectInputVo); } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java index 4f3b897c2..73d639445 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java @@ -183,7 +183,7 @@ public class PmsProjectServiceImpl implements IPmsProjectService } PmsProject pmsProject = pmsProjectInputVo.toPmsProject(); pmsProject.setDeptId(pmsEnterprise.getDeptId()); - int count = pmsProjectMapper.insertPmsProject(pmsProject); + pmsProjectMapper.insertPmsProject(pmsProject); //同步新增项目-仓库数据 if (StringUtils.isNotEmpty(pmsProjectInputVo.getProjectRepositoryIds())) { List repositoryIdList = Arrays.asList(pmsProjectInputVo.getProjectRepositoryIds().split(",")); @@ -220,7 +220,7 @@ public class PmsProjectServiceImpl implements IPmsProjectService } } } - return count; + return pmsProject.getId().intValue(); } /**