From 10fbe0b7ce2d6f991e7ac7980c49f73e0c1fd8c5 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Mon, 11 Dec 2023 14:47:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E7=AB=A0=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91):=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AF=84=E8=AE=BA=E5=AF=B9=E5=BA=94Issue?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=96=87=E7=AB=A0=E8=AE=BF=E9=97=AE=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=94=B1=E4=BB=93=E5=BA=93=E6=96=87=E4=BB=B6=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=9C=B0=E5=9D=80=E6=94=B9=E6=88=90=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E8=AE=BF=E9=97=AE=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/httpClient/util/GitLinkRequestHelper.java | 2 +- .../com/ruoyi/cms/doc/domain/gitlink/IssueInputDto.java | 2 -- .../cms/doc/service/impl/CmsDocCommentServiceImpl.java | 6 ++---- .../main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/util/GitLinkRequestHelper.java b/ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/util/GitLinkRequestHelper.java index c5df35928..bc409899c 100644 --- a/ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/util/GitLinkRequestHelper.java +++ b/ruoyi-common/ruoyi-common-httpClient/src/main/java/com/ruoyi/common/httpClient/util/GitLinkRequestHelper.java @@ -62,7 +62,7 @@ public class GitLinkRequestHelper { * 带参数的请求 * * @param gitLinkRequestUrl - * @param jsonObject + * @param object * @param requestType * @return */ diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/gitlink/IssueInputDto.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/gitlink/IssueInputDto.java index 78af3445a..252accdbd 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/gitlink/IssueInputDto.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/gitlink/IssueInputDto.java @@ -13,8 +13,6 @@ import java.util.Date; @Data @ApiModel("Gitlink Issue输入对象") public class IssueInputDto { - public IssueInputDto() { - } public IssueInputDto(CmsDoc cmsDoc, String docUrl) { this.subject = cmsDoc.getName(); diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java index e16fad751..1c63387d0 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java @@ -45,11 +45,9 @@ public class CmsDocCommentServiceImpl implements ICmsDocCommentService { CmsDoc cmsDoc = cmsDocService.selectBaseCmsDocById(docId); CmsProject cmsProject = cmsProjectService.selectCmsProjectByDeptId(cmsDoc.getDeptId()); if (!checkIssueIsExist(cmsDoc.getIssueId(), cmsProject)) { + String zoneDocUrl = cmsDocService.getDocDetailUrl(cmsProject.getDeptId(), cmsDoc.getId()); // 若关联的Issue不存在，则创建Issue - String gitlinkDocUrl = CmsGitLinkRequestUrl.GITLINK_DOC_FILE_URL(gitLinkRequestHelper.gitLinkUrl - , cmsProject.getUsername(), cmsProject.getIdentifier(), - cmsDoc.getDirName(), cmsDoc.getFileName()); - IssueInputDto issueInputDto = new IssueInputDto(cmsDoc, gitlinkDocUrl); + IssueInputDto issueInputDto = new IssueInputDto(cmsDoc, zoneDocUrl); JSONObject issueJson = new JSONObject(); Map, String> formatPatterns = new HashMap<>(); formatPatterns.put(Date.class, "yyyy-MM-dd"); // 添加Date类型的格式化pattern diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java index f75276143..8b39e99dc 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java @@ -192,8 +192,8 @@ public class CmsGitLinkRequestUrl extends GitLinkRequestUrl { return getAdminGitLinkRequestUrl(String.format("/api/v1/%s/%s/issues/%d/journals/%d", username, identifier, issueId, journalId)); } - public static String GITLINK_DOC_FILE_URL(String gitlinkUrl, String username, String identifier, String dirName, String fileName) { - return EscapeUtil.removeExtraSlashOfUrl(String.format("%s/%s/%s/tree/master/%s/%s", gitlinkUrl, username, identifier, dirName, fileName)); + public static String ZONE_DOC_URL(String gitlinkUrl, String zoneKey, Long docId) { + return EscapeUtil.removeExtraSlashOfUrl(String.format("%s/zone/%s/newdetail/%d", gitlinkUrl, zoneKey, docId)); } private static String buildUri(String url, Map params) throws URISyntaxException {