From 600644087811f96003aad1cf5f2637f4721647f7 Mon Sep 17 00:00:00 2001 From: otto <731554297@qq.com> Date: Fri, 12 Jun 2026 15:25:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=B6=85=E7=AE=97=E4=B8=93=E5=8C=BA):=20?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=B7=B2=E6=8B=92=E7=BB=9D=E7=9A=84=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E6=93=8D=E4=BD=9C=E6=97=B6=E9=87=8D=E6=96=B0=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=AF=B9=E5=BA=94PR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/doc/service/impl/CmsDocServiceImpl.java | 7 +++++++ .../com/microservices/cms/utils/CmsGitLinkRequestUrl.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java index e3bab1ac4..b1d8253d7 100644 --- a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java +++ b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java @@ -802,6 +802,13 @@ public class CmsDocServiceImpl implements ICmsDocService { return newDocWithAudit.getId(); } oldCmsDoc.setAuditStatus(DocAuditStatus.TO_BE_AUDIT.getAuditCode()); + if (oldCmsDoc.getAuditType().contains(DocAndZoneOperation.OPERATION_CREATE.getOperationCode()) + || oldCmsDoc.getAuditType().contains(DocAndZoneOperation.OPERATION_UPDATE.getOperationCode())) { + CmsProject cmsProject = cmsProjectService.selectCmsProjectByDeptId(oldCmsDoc.getDeptId()); + // 重新开启PR + String gitLinkPullRequestNumber = oldCmsDoc.getAuditPrNumber().split("-")[0]; + gitLinkRequestHelper.doPost(CmsGitLinkRequestUrl.REOPEN_PULL_REQUEST(cmsProject, gitLinkPullRequestNumber), null); + } // 待审核/未通过文章重新编辑 cmsDocMapper.updateCmsDoc(oldCmsDoc); return oldCmsDoc.getId(); diff --git a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/utils/CmsGitLinkRequestUrl.java b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/utils/CmsGitLinkRequestUrl.java index 1e55d8389..44bdc41b9 100644 --- a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/utils/CmsGitLinkRequestUrl.java +++ b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/utils/CmsGitLinkRequestUrl.java @@ -15,6 +15,7 @@ public class CmsGitLinkRequestUrl extends GitLinkRequestUrl { public static GitLinkRequestUrl ADD_USER_TO_ORGANIZATION_TEAM(String orgIdentifier, Long teamId) { return getAdminGitLinkRequestUrl(String.format("/api/organizations/%s/teams/%d/team_users.json", orgIdentifier, teamId)); } + public static String TEAMS_BY_ORGANIZATION_URL(Long orgId) { return String.format("/api/organizations/%s/teams.json", orgId); } @@ -87,6 +88,12 @@ public class CmsGitLinkRequestUrl extends GitLinkRequestUrl { ); } + public static GitLinkRequestUrl REOPEN_PULL_REQUEST(CmsProject cmsProject, String giteaPrNumber) { + return getGitLinkRequestUrl( + String.format("/api/v1/%s/%s/pulls/%s/reopen", cmsProject.getUsername(), cmsProject.getIdentifier(), giteaPrNumber) + ); + } + public static GitLinkRequestUrl GET_PULL_REQUEST_DETAILS(CmsProject cmsProject, String giteaPrNumber) { return getGitLinkRequestUrl( String.format("/api/%s/%s/pulls/%s.json", cmsProject.getUsername(), cmsProject.getIdentifier(), giteaPrNumber)