From 67bf5caecf1dba976bf68382b825ab628ad348a9 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Mon, 2 Sep 2024 15:47:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90):=20?= =?UTF-8?q?=E9=9D=9E=E5=86=85=E7=BD=AE=E7=94=A8=E6=88=B7=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E6=97=B6=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E4=B8=8EForge=E6=9D=83=E9=99=90=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E5=AF=BC=E8=87=B4=E5=BC=82=E6=AD=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复方案：Forge所有操作均调整为Forge内置管理员进行操作 --- .../httpClient/domain/GitLinkRequestUrl.java | 2 +- .../impl/PmsCommonAsyncServiceImpl.java | 7 +++ .../pms/utils/PmsGitLinkRequestUrl.java | 63 ++----------------- 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/microservices-common/microservices-common-httpClient/src/main/java/com/microservices/common/httpClient/domain/GitLinkRequestUrl.java b/microservices-common/microservices-common-httpClient/src/main/java/com/microservices/common/httpClient/domain/GitLinkRequestUrl.java index b84f365d8..49974825f 100644 --- a/microservices-common/microservices-common-httpClient/src/main/java/com/microservices/common/httpClient/domain/GitLinkRequestUrl.java +++ b/microservices-common/microservices-common-httpClient/src/main/java/com/microservices/common/httpClient/domain/GitLinkRequestUrl.java @@ -59,7 +59,7 @@ public class GitLinkRequestUrl { } public static GitLinkRequestUrl GET_LIST_BY_PAGES(String url, Integer page, Integer limit) { - return getGitLinkRequestUrl(String.format("%s?page=%d&limit=%d", url, page, limit)); + return getAdminGitLinkRequestUrl(String.format("%s?page=%d&limit=%d", url, page, limit)); } /** 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 ca9406223..816c6e7d9 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 @@ -5,6 +5,7 @@ import com.microservices.common.core.constant.SecurityConstants; import com.microservices.common.core.enums.SystemRole; import com.microservices.common.core.exception.ServiceException; import com.microservices.common.core.utils.DateUtils; +import com.microservices.common.httpClient.domain.GitLinkRequestUrl; import com.microservices.common.httpClient.util.GitLinkRequestHelper; import com.microservices.pms.common.service.IPmsCommonAsyncService; import com.microservices.pms.common.service.IPmsCommonService; @@ -245,6 +246,12 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { CustomExecutorFactory.threadPoolExecutor.execute(() -> { PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseById(enterpriseId); try { + // Forge组织中添加内置管理员用户 + JSONObject gitlinkAdminUser = gitLinkRequestHelper.doGet(GitLinkRequestUrl.USER(gitLinkRequestHelper.adminUsername)); + GitLinkUserToEnterpriseInputVo adminUser = new GitLinkUserToEnterpriseInputVo(); + adminUser.setUserId(gitlinkAdminUser.getLong("user_id")); + adminUser.setRoleKey(SystemRole.PMS_ORG_ADMIN.getRoleKey()); + gitLinkUserToEnterpriseInputVoList.add(adminUser); pmsEnterpriseService.increaseOpenEnterpriseProcessCount(pmsEnterprise.getGitlinkOrgId()); // 获取组织下所有团队 List gitlinkOrganizationTeamVoList = pmsCommonService.getAllGitlinkOrgTeams(pmsEnterprise.getGitlinkOrgId()); 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 0603dc7e8..56c37d119 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 @@ -17,13 +17,6 @@ import java.util.Map; */ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { - /** - * 获取组织下用户列表 - */ - public static String USER_LIST_BY_ORGANIZATIONS_URL(Long orgId) { - return String.format("/api/organizations/%d/organization_users.json", orgId); - } - /** * 获取组织团队下用户列表 */ @@ -31,22 +24,6 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { return String.format("/api/organizations/%s/teams/%d/team_users.json", orgIdentify, teamId); } - /** - * 检查用户是否在组织下 - */ - public static GitLinkRequestUrl CHECK_USER_IN_ORGANIZATION(Long orgId,String username) { - return getOpenGitLinkRequestUrl(String.format( - "/api/organizations/%d/organization_users/pm_check_user?username=%s", orgId,username - )); - } - - /** - * 创建组织 - */ - public static GitLinkRequestUrl CREATE_ORGANIZATION() { - return getGitLinkRequestUrl("/api/organizations.json"); - } - /** * 获取或更新组织 */ @@ -54,20 +31,6 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { return getAdminGitLinkRequestUrl(String.format("/api/organizations/%d.json", gitlinkOrgId)); } - /** - * 组织下新增用户 - */ - public static GitLinkRequestUrl ADD_USER_BY_ORGANIZATION(String orgIdentifier, Long teamId) { - return getGitLinkRequestUrl(String.format("/api/organizations/%s/teams/%d/team_users.json", orgIdentifier, teamId)); - } - - /** - * 组织下删除用户 - */ - public static GitLinkRequestUrl DELETE_USER_BY_ORGANIZATION(String orgIdentifier, Long teamId, String username) { - return getGitLinkRequestUrl(String.format("/api/organizations/%s/teams/%d/team_users/%s.json", orgIdentifier, teamId, username)); - } - /** * 查询组织下团队列表 */ @@ -86,28 +49,28 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { * 创建组织团队 */ public static GitLinkRequestUrl CREATE_ORGANIZATION_TEAM(String orgIdentifier) { - return getGitLinkRequestUrl(String.format("/api/organizations/%s/teams.json", orgIdentifier)); + return getAdminGitLinkRequestUrl(String.format("/api/organizations/%s/teams.json", orgIdentifier)); } /** * 添加用户到组织团队（重复添加不会报错） */ public static GitLinkRequestUrl ADD_USER_TO_ORGANIZATION_TEAM(String orgIdentifier, Long teamId) { - return getGitLinkRequestUrl(String.format("/api/organizations/%s/teams/%d/team_users.json", orgIdentifier, teamId)); + return getAdminGitLinkRequestUrl(String.format("/api/organizations/%s/teams/%d/team_users.json", orgIdentifier, teamId)); } /** * 从gitlink组织中移除用户 */ public static GitLinkRequestUrl DELETE_USER_FROM_ORGANIZATION_TEAM(String orgIdentifier, Long teamId, String username) { - return getGitLinkRequestUrl(String.format("/api/organizations/%s/teams/%d/team_users/%s.json", orgIdentifier, teamId, username)); + return getAdminGitLinkRequestUrl(String.format("/api/organizations/%s/teams/%d/team_users/%s.json", orgIdentifier, teamId, username)); } /** * 删除组织团队 */ public static GitLinkRequestUrl DELETE_ORGANIZATION_TEAM(Long orgId, Long teamId) { - return getGitLinkRequestUrl(String.format("/api/organizations/%d/teams/%d.json", orgId, teamId)); + return getAdminGitLinkRequestUrl(String.format("/api/organizations/%d/teams/%d.json", orgId, teamId)); } /** @@ -119,15 +82,6 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { )); } - /** - * 通过gitlink用户id获取gitlink用户信息 - */ - public static GitLinkRequestUrl GET_USER_INFO_BY_ID(Long gitLinkUserId) { - return getOpenGitLinkRequestUrl(String.format( - "/api/users/%s.json", gitLinkUserId - )); - } - /** * 获取仓库详情 */ @@ -168,15 +122,6 @@ public class PmsGitLinkRequestUrl extends GitLinkRequestUrl { return getGitLinkRequestUrl(buildUri("/api/pm/issues/tags", params)); } - /** - * 获取仓库中issue标记 - */ - public static GitLinkRequestUrl GET_REPO_ISSUE_TAGS(String owner, String repo) { - return getGitLinkRequestUrl(String.format( - "/api/v1/%s/%s/issue_tags?only_name=true", owner, repo - )); - } - public static GitLinkRequestUrl GET_BRANCHES_BY_REPO_ID(String owner, String repo) { return getGitLinkRequestUrl(String.format( "/api/%s/%s/branches.json", owner, repo