From 0418c5df561ed2de35c674d41dfdb93ef7889d7c Mon Sep 17 00:00:00 2001 From: TimeBye Date: Fri, 27 May 2022 13:59:22 +0800 Subject: [PATCH 01/41] =?UTF-8?q?[FIX]=E4=BF=AE=E5=A4=8Dchart=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=90=8E=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chart/gitlab-service/templates/NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/gitlab-service/templates/NOTES.txt b/chart/gitlab-service/templates/NOTES.txt index 9f6345e..c9a7709 100755 --- a/chart/gitlab-service/templates/NOTES.txt +++ b/chart/gitlab-service/templates/NOTES.txt @@ -3,7 +3,7 @@ Verify deployment: curl -s $(kubectl get po --namespace {{ .Release.Namespace }} \ - -l choerodon.io/release={{ .Release.Name }} \ + -l app.kubernetes.io/name={{ .Release.Name }} \ -o jsonpath="{.items[0].status.podIP}"):{{ .Values.containerPort.actuatorPort }}/actuator/health | jq -r .status If the following similar information appears, it is a successful deployment: From dba1c7ab19678a726cb2048200062a170cd7c75d Mon Sep 17 00:00:00 2001 From: lihao <310103270@qq.com> Date: Mon, 30 May 2022 16:10:39 +0800 Subject: [PATCH 02/41] =?UTF-8?q?[IMP]=20=E4=BF=AE=E6=94=B9=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E5=8A=A0=E5=AF=86=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/resources/messages/messages_zh_CN.properties | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 10c32c7..6ea5e51 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.0.0.RELEASE + 2.1.0-SNAPSHOT jar https://github.com/choerodon/gitlab-service diff --git a/src/main/resources/messages/messages_zh_CN.properties b/src/main/resources/messages/messages_zh_CN.properties index df59402..fe0a083 100644 --- a/src/main/resources/messages/messages_zh_CN.properties +++ b/src/main/resources/messages/messages_zh_CN.properties @@ -55,4 +55,5 @@ error.member.projects.list=获取用户的gitlab项目失败 error.user.email.check=用户邮箱校验失败 error.reset.user.password=重置用户密码失败 error.group.variable.get=获取组变量失败 -error.group.variable.create=创建组变量失败 \ No newline at end of file +error.group.variable.create=创建组变量失败 +error.key-encrypt.decrypt.abnormal_content=页面失效，请重新访问首页进入 \ No newline at end of file From 31e8aa853babaa2f672ee295db8c239566a8ab57 Mon Sep 17 00:00:00 2001 From: TimeBye Date: Thu, 9 Jun 2022 18:35:10 +0800 Subject: [PATCH 03/41] =?UTF-8?q?[IMP]=E8=B0=83=E6=95=B4=E6=8E=A2=E9=92=88?= =?UTF-8?q?=E5=91=A8=E6=9C=9F,=E9=BB=98=E8=AE=A4=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8E=A2=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chart/gitlab-service/templates/deployment.yaml | 5 ++--- chart/gitlab-service/values.yaml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/chart/gitlab-service/templates/deployment.yaml b/chart/gitlab-service/templates/deployment.yaml index 27e7232..99aa66c 100755 --- a/chart/gitlab-service/templates/deployment.yaml +++ b/chart/gitlab-service/templates/deployment.yaml @@ -194,9 +194,8 @@ spec: {{- end }} {{- if .Values.startupProbe.enabled }} startupProbe: - httpGet: - path: /actuator/health - port: actuator + tcpSocket: + port: server initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }} periodSeconds: {{ .Values.startupProbe.periodSeconds }} timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }} diff --git a/chart/gitlab-service/values.yaml b/chart/gitlab-service/values.yaml index 1afd656..2d268d1 100755 --- a/chart/gitlab-service/values.yaml +++ b/chart/gitlab-service/values.yaml @@ -264,7 +264,7 @@ livenessProbe: # -- Enable livenessProbe enabled: true # -- Initial delay seconds for livenessProbe - initialDelaySeconds: 480 + initialDelaySeconds: 300 # -- Period seconds for livenessProbe periodSeconds: 5 # -- Timeout seconds for livenessProbe @@ -272,12 +272,12 @@ livenessProbe: # -- Success threshold for livenessProbe successThreshold: 1 # -- Failure threshold for livenessProbe - failureThreshold: 5 + failureThreshold: 2 readinessProbe: # -- Enable readinessProbe enabled: true # -- Initial delay seconds for readinessProbe - initialDelaySeconds: 30 + initialDelaySeconds: 20 # -- Period seconds for readinessProbe periodSeconds: 5 # -- Timeout seconds for readinessProbe @@ -285,16 +285,16 @@ readinessProbe: # -- Success threshold for readinessProbe successThreshold: 1 # -- Failure threshold for readinessProbe - failureThreshold: 5 + failureThreshold: 2 startupProbe: # -- Enable startupProbe - enabled: false + enabled: true # -- Initial delay seconds for startupProbe - initialDelaySeconds: 0 + initialDelaySeconds: 10 # -- Period seconds for startupProbe - periodSeconds: 5 + periodSeconds: 3 # -- Timeout seconds for startupProbe - timeoutSeconds: 3 + timeoutSeconds: 2 # -- Success threshold for startupProbe successThreshold: 1 # -- Failure threshold for startupProbe From 51c04cfaba537effded3992fdd7d1e37155782a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 27 Jun 2022 14:27:05 +0800 Subject: [PATCH 04/41] =?UTF-8?q?[IMP]=20=E8=A7=A3=E5=86=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=BC=82=E5=91=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/api/controller/v1/CommitController.java | 6 +----- .../api/controller/v1/PipelineScheduleController.java | 1 - .../io/choerodon/gitlab/api/vo/GitlabUserReqDTO.java | 2 -- .../io/choerodon/gitlab/app/service/ConfigService.java | 2 -- .../io/choerodon/gitlab/app/service/HookService.java | 1 - .../gitlab/app/service/RepositoryService.java | 10 ---------- .../gitlab/app/service/impl/GroupServiceImpl.java | 4 +--- .../gitlab/app/service/impl/RepositoryServiceImpl.java | 2 -- .../gitlab/infra/common/config/GitlabHealthy.java | 6 +++--- 9 files changed, 5 insertions(+), 29 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/CommitController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/CommitController.java index 4fe69e6..8abf67d 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/CommitController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/CommitController.java @@ -3,9 +3,6 @@ import java.util.List; import java.util.Optional; -import io.choerodon.gitlab.api.vo.CommitVO; -import io.choerodon.gitlab.api.vo.GitlabTransferVO; - import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.gitlab4j.api.models.Commit; @@ -18,10 +15,9 @@ import io.choerodon.core.exception.FeignException; import io.choerodon.gitlab.api.vo.CommitStatuseVO; +import io.choerodon.gitlab.api.vo.GitlabTransferVO; import io.choerodon.gitlab.app.service.CommitService; -import javax.validation.Valid; - /** * Created by zzy on 2018/1/14. */ diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/PipelineScheduleController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/PipelineScheduleController.java index a1ba8d4..91d3159 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/PipelineScheduleController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/PipelineScheduleController.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam; import org.gitlab4j.api.models.PipelineSchedule; import org.gitlab4j.api.models.Variable; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/io/choerodon/gitlab/api/vo/GitlabUserReqDTO.java b/src/main/java/io/choerodon/gitlab/api/vo/GitlabUserReqDTO.java index 7ab6000..ce83d7c 100644 --- a/src/main/java/io/choerodon/gitlab/api/vo/GitlabUserReqDTO.java +++ b/src/main/java/io/choerodon/gitlab/api/vo/GitlabUserReqDTO.java @@ -1,7 +1,5 @@ package io.choerodon.gitlab.api.vo; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.Date; /** diff --git a/src/main/java/io/choerodon/gitlab/app/service/ConfigService.java b/src/main/java/io/choerodon/gitlab/app/service/ConfigService.java index 90074df..44146bf 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/ConfigService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/ConfigService.java @@ -1,7 +1,5 @@ package io.choerodon.gitlab.app.service; -import org.springframework.http.ResponseEntity; - /** * @author: trump * @date: 2019/8/21 16:33 diff --git a/src/main/java/io/choerodon/gitlab/app/service/HookService.java b/src/main/java/io/choerodon/gitlab/app/service/HookService.java index 1d552d6..51b4cde 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/HookService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/HookService.java @@ -2,7 +2,6 @@ import java.util.List; -import org.gitlab4j.api.models.CommitStatuse; import org.gitlab4j.api.models.ProjectHook; diff --git a/src/main/java/io/choerodon/gitlab/app/service/RepositoryService.java b/src/main/java/io/choerodon/gitlab/app/service/RepositoryService.java index 6697f98..4265de7 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/RepositoryService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/RepositoryService.java @@ -105,16 +105,6 @@ public interface RepositoryService { */ List listBranches(Integer projectId, Integer userId, AppExternalConfigDTO appExternalConfigDTO); - -// /** -// * 项目下创建readme -// * -// * @param projectId 项目id -// * @param userId 用户Id -// */ -// boolean createFile(Integer projectId, Integer userId); - - /** * 项目下获取file * diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index 9e3698d..8b479cf 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -238,9 +238,7 @@ public void deleteVariable(Integer groupId, String key, Integer userId) { @Override public void batchDeleteVariable(Integer groupId, List keys, Integer userId) { - keys.forEach(key -> { - deleteVariable(groupId, key, userId); - }); + keys.forEach(key -> deleteVariable(groupId, key, userId)); } @Override diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/RepositoryServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/RepositoryServiceImpl.java index c7b8430..0ddcdc5 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/RepositoryServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/RepositoryServiceImpl.java @@ -26,8 +26,6 @@ @Service public class RepositoryServiceImpl implements RepositoryService { - private static final Logger logger = LoggerFactory.getLogger(RepositoryServiceImpl.class); - private Gitlab4jClient gitlab4jclient; public RepositoryServiceImpl(Gitlab4jClient gitlab4jclient) { diff --git a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java index b96df31..17eaf96 100644 --- a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java +++ b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java @@ -1,8 +1,5 @@ package io.choerodon.gitlab.infra.common.config; -import io.choerodon.core.exception.CommonException; -import io.choerodon.core.exception.FeignException; -import io.choerodon.gitlab.app.service.impl.GroupServiceImpl; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; import org.slf4j.Logger; @@ -12,6 +9,9 @@ import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.stereotype.Component; +import io.choerodon.core.exception.CommonException; +import io.choerodon.core.exception.FeignException; + @Component public class GitlabHealthy implements HealthIndicator { From b3547a23c63a9a3bba80f80bb415f737b8d1bf43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 27 Jun 2022 16:18:09 +0800 Subject: [PATCH 05/41] [IMP] update pom version --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ea5e51..b5892c9 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,6 @@ io.choerodon choerodon-gitlab4j-api - 1.3.0-SNAPSHOT org.springframework.boot From 30771b28cfce475fdb9861dabf3628b6e4d36266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Mon, 4 Jul 2022 16:13:42 +0800 Subject: [PATCH 06/41] =?UTF-8?q?[IMP]=20=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5892c9..701bbba 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ io.choerodon choerodon-framework-parent - 2.0.0.RELEASE + 2.1.0.RELEASE @@ -25,6 +25,10 @@ + + io.choerodon + choerodon-starter-core + io.choerodon choerodon-starter-limit From 102cf151d8456d1c25c812e5dc2fe546c963488a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 4 Jul 2022 16:42:59 +0800 Subject: [PATCH 07/41] Update pom.xml --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 701bbba..1b5315f 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,6 @@ - - io.choerodon - choerodon-starter-core - io.choerodon choerodon-starter-limit From 83e960698c3971fa0ecd25c524d2281f76307acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Fri, 8 Jul 2022 15:19:34 +0800 Subject: [PATCH 08/41] =?UTF-8?q?[IMP]=20=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b5315f..3520aa8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.0-SNAPSHOT + 2.1.0.RELEASE jar https://github.com/choerodon/gitlab-service From e7fde9220dbd99b4f76e790c2c13462ae42f9e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Fri, 8 Jul 2022 15:22:19 +0800 Subject: [PATCH 09/41] =?UTF-8?q?[IMP]=20=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3520aa8..070471d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.0.RELEASE + 2.2.0-SNAPSHOT jar https://github.com/choerodon/gitlab-service From 0f171f5b18d3b18c05b0013aa8de79fbbba36f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E7=BF=94?= Date: Fri, 15 Jul 2022 09:07:17 +0800 Subject: [PATCH 10/41] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3520aa8..b48054f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.0.RELEASE + 2.1.1-SNAPSHOT jar https://github.com/choerodon/gitlab-service @@ -12,7 +12,7 @@ io.choerodon choerodon-framework-parent - 2.1.0.RELEASE + 2.1.1.RELEASE From 773d26ebb85cb480bce76db052ffd6ac1a56fd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E7=BF=94?= Date: Fri, 15 Jul 2022 09:08:56 +0800 Subject: [PATCH 11/41] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b48054f..c9a1920 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.1-SNAPSHOT + 2.1.1.RELEASE jar https://github.com/choerodon/gitlab-service From 53321533075569bb876403e0395befe934853512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E7=BF=94?= Date: Fri, 15 Jul 2022 09:45:36 +0800 Subject: [PATCH 12/41] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9a1920..b48054f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.1.RELEASE + 2.1.1-SNAPSHOT jar https://github.com/choerodon/gitlab-service From bf605d5a7e55b7c0af13b15d0695d765d3f3443b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E7=BF=94?= Date: Fri, 15 Jul 2022 10:10:07 +0800 Subject: [PATCH 13/41] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b48054f..c9a1920 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.1-SNAPSHOT + 2.1.1.RELEASE jar https://github.com/choerodon/gitlab-service From dd56c817b306fbe7b5059055cd5810075add2e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Fri, 29 Jul 2022 17:45:10 +0800 Subject: [PATCH 14/41] =?UTF-8?q?[imp]=20=E4=B8=B4=E6=97=B6=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 +- .../infra/common/config/GitlabHealthy.java | 47 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index c9a1920..1c43310 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.1.RELEASE + 2.1.2-SNAPSHOT jar https://github.com/choerodon/gitlab-service @@ -56,6 +56,7 @@ io.choerodon choerodon-gitlab4j-api + 2.1.2.RELEASE org.springframework.boot diff --git a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java index 17eaf96..79a76f6 100644 --- a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java +++ b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java @@ -27,28 +27,29 @@ public class GitlabHealthy implements HealthIndicator { @Override public Health health() { LOGGER.info("健康检查探测"); - GitLabApi gitLabApi = new GitLabApi(url, privateToken); - int errorCode = 0; - try { - gitLabApi.getUserApi().getCurrentUser(); - } catch (GitLabApiException e) { - if (e.getHttpStatus() == 401) { - errorCode = 401; - } else if (e.getHttpStatus() == 404) { - errorCode = 404; - } else { - throw new CommonException(e); - } - } - if (errorCode == 401 || errorCode == 404) { - return Health.down().withDetail("Error Code", "the token or the url is error, or the ingress resolution error!").build(); - } else { - try { - gitLabApi.getApplicationApi().modifyApplicationSetting(true); - } catch (GitLabApiException e) { - throw new FeignException(e); - } - return Health.up().build(); - } +// GitLabApi gitLabApi = new GitLabApi(url, privateToken); +// int errorCode = 0; +// try { +// gitLabApi.getUserApi().getCurrentUser(); +// } catch (GitLabApiException e) { +// if (e.getHttpStatus() == 401) { +// errorCode = 401; +// } else if (e.getHttpStatus() == 404) { +// errorCode = 404; +// } else { +// throw new CommonException(e); +// } +// } +// if (errorCode == 401 || errorCode == 404) { +// return Health.down().withDetail("Error Code", "the token or the url is error, or the ingress resolution error!").build(); +// } else { +// try { +// gitLabApi.getApplicationApi().modifyApplicationSetting(true); +// } catch (GitLabApiException e) { +// throw new FeignException(e); +// } +// return Health.up().build(); +// } + return null; } } From 483509f31c4caecf293c413c446044c4382b0456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 1 Aug 2022 09:42:09 +0800 Subject: [PATCH 15/41] =?UTF-8?q?[imp]=20=E4=BF=AE=E6=94=B9=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/api/controller/v1/GroupsController.java | 5 +++-- .../io/choerodon/gitlab/app/service/GroupService.java | 2 +- .../gitlab/app/service/impl/GroupServiceImpl.java | 9 +++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java index 9ddef8b..2a557dc 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java @@ -230,8 +230,9 @@ public ResponseEntity> listProjects( @RequestParam(value = "owned", required = false) Boolean owned, @RequestParam(value = "search", required = false) String search, @RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "perPage", required = false) Integer perPage) { - return ResponseEntity.ok(groupService.listProjects(groupId, userId, owned, search, page, perPage)); + @RequestParam(value = "perPage", required = false) Integer perPage, + @RequestParam(value = "minAccessLevel", required = false) Integer minAccessLevel) { + return ResponseEntity.ok(groupService.listProjects(groupId, userId, owned, search, page, perPage, minAccessLevel)); } /** diff --git a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java index aae272e..e6b5491 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java @@ -196,7 +196,7 @@ List batchCreateVariable(Integer groupId, * @param userId 用户Id * @return List */ - List listProjects(Integer groupId, Integer userId, Boolean owned, String search, Integer page, Integer perPage); + List listProjects(Integer groupId, Integer userId, Boolean owned, String search, Integer page, Integer perPage, Integer minAccessLevel); List queryGroupWithStatisticsByName(String groupName, Integer userId, Boolean statistics); diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index 8b479cf..87cb6f1 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -262,11 +262,16 @@ public List batchCreateVariable(Integer groupId, List list } @Override - public List listProjects(Integer groupId, Integer userId, Boolean owned, String search, Integer page, Integer perPage) { + public List listProjects(Integer groupId, Integer userId, Boolean owned, String search, Integer page, Integer perPage, Integer minAccessLevel) { GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); try { GroupProjectsFilter groupProjectsFilter = new GroupProjectsFilter(); - groupProjectsFilter.withOwned(owned).withSearch(search).withPage(page).withPerPage(perPage); + groupProjectsFilter + .withOwned(owned) + .withSearch(search) + .withPage(page) + .withPerPage(perPage) + .withMinAccessLevel(minAccessLevel); return gitLabApi.getGroupApi().getProjects(groupId, groupProjectsFilter); } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); From 0bf97990f4974554ed84a129d1e818d2949f088c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 1 Aug 2022 10:53:10 +0800 Subject: [PATCH 16/41] =?UTF-8?q?[imp]=20=E5=8F=96=E6=B6=88=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/common/config/GitlabHealthy.java | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java index 79a76f6..17eaf96 100644 --- a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java +++ b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java @@ -27,29 +27,28 @@ public class GitlabHealthy implements HealthIndicator { @Override public Health health() { LOGGER.info("健康检查探测"); -// GitLabApi gitLabApi = new GitLabApi(url, privateToken); -// int errorCode = 0; -// try { -// gitLabApi.getUserApi().getCurrentUser(); -// } catch (GitLabApiException e) { -// if (e.getHttpStatus() == 401) { -// errorCode = 401; -// } else if (e.getHttpStatus() == 404) { -// errorCode = 404; -// } else { -// throw new CommonException(e); -// } -// } -// if (errorCode == 401 || errorCode == 404) { -// return Health.down().withDetail("Error Code", "the token or the url is error, or the ingress resolution error!").build(); -// } else { -// try { -// gitLabApi.getApplicationApi().modifyApplicationSetting(true); -// } catch (GitLabApiException e) { -// throw new FeignException(e); -// } -// return Health.up().build(); -// } - return null; + GitLabApi gitLabApi = new GitLabApi(url, privateToken); + int errorCode = 0; + try { + gitLabApi.getUserApi().getCurrentUser(); + } catch (GitLabApiException e) { + if (e.getHttpStatus() == 401) { + errorCode = 401; + } else if (e.getHttpStatus() == 404) { + errorCode = 404; + } else { + throw new CommonException(e); + } + } + if (errorCode == 401 || errorCode == 404) { + return Health.down().withDetail("Error Code", "the token or the url is error, or the ingress resolution error!").build(); + } else { + try { + gitLabApi.getApplicationApi().modifyApplicationSetting(true); + } catch (GitLabApiException e) { + throw new FeignException(e); + } + return Health.up().build(); + } } } From 8fb1cd950177144e2d0b76f059123cef126df267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 1 Aug 2022 11:31:19 +0800 Subject: [PATCH 17/41] =?UTF-8?q?[imp]=20=E4=BF=AE=E6=94=B9=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/infra/common/config/GitlabHealthy.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java index 17eaf96..7dd5262 100644 --- a/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java +++ b/src/main/java/io/choerodon/gitlab/infra/common/config/GitlabHealthy.java @@ -2,6 +2,8 @@ import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; +import org.gitlab4j.api.models.ApplicationSettings; +import org.gitlab4j.api.models.Setting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -44,7 +46,10 @@ public Health health() { return Health.down().withDetail("Error Code", "the token or the url is error, or the ingress resolution error!").build(); } else { try { - gitLabApi.getApplicationApi().modifyApplicationSetting(true); + ApplicationSettings applicationSettings = gitLabApi.getApplicationSettingsApi().getApplicationSettings(); + if (!Boolean.TRUE.equals(applicationSettings.getSetting(Setting.ALLOW_LOCAL_REQUESTS_FROM_WEB_HOOKS_AND_SERVICES))) { + gitLabApi.getApplicationSettingsApi().updateApplicationSetting(Setting.ALLOW_LOCAL_REQUESTS_FROM_WEB_HOOKS_AND_SERVICES, true); + } } catch (GitLabApiException e) { throw new FeignException(e); } From 959550a311f656e43c4f6bbe77086d8ddda193b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 1 Aug 2022 14:31:29 +0800 Subject: [PATCH 18/41] =?UTF-8?q?[imp]=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2group=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/api/controller/v1/GroupsController.java | 10 ++++++++++ .../io/choerodon/gitlab/app/service/GroupService.java | 1 + .../gitlab/app/service/impl/GroupServiceImpl.java | 11 +++++++++++ 3 files changed, 22 insertions(+) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java index 2a557dc..db6b332 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java @@ -253,6 +253,16 @@ public ResponseEntity queryGroupByName( return new ResponseEntity<>(groupService.queryGroupByName(groupName, userId), HttpStatus.OK); } + @ApiOperation(value = "根据组id查询组") + @GetMapping(value = "/{group_iid}") + public ResponseEntity queryGroupByIid( + @ApiParam(value = "组名", required = true) + @PathVariable(value = "group_iid") Integer groupIid, + @ApiParam(value = "userId") + @RequestParam(required = false) Integer userId) { + return new ResponseEntity<>(groupService.queryGroupByIid(groupIid, userId), HttpStatus.OK); + } + @ApiOperation(value = "根据组名检索组的列表") @GetMapping(value = "/{group_name}/with_statistics") public ResponseEntity> queryGroupWithStatisticsByName( diff --git a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java index e6b5491..1db290a 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java @@ -200,4 +200,5 @@ List batchCreateVariable(Integer groupId, List queryGroupWithStatisticsByName(String groupName, Integer userId, Boolean statistics); + Group queryGroupByIid(Integer groupIid, Integer userId); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index 87cb6f1..5689e73 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import io.choerodon.core.exception.CommonException; import io.choerodon.core.exception.FeignException; import io.choerodon.gitlab.api.vo.GroupVO; import io.choerodon.gitlab.api.vo.MemberVO; @@ -288,4 +289,14 @@ public List queryGroupWithStatisticsByName(String groupName, Integer user return null; } } + + @Override + public Group queryGroupByIid(Integer groupIid, Integer userId) { + GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); + try { + return gitLabApi.getGroupApi().getGroup(groupIid); + } catch (GitLabApiException e) { + throw new FeignException(e.getMessage(), e); + } + } } \ No newline at end of file From 31bf819d855be2f943cfc43c5edcf7ae96f7b9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 1 Aug 2022 16:44:29 +0800 Subject: [PATCH 19/41] =?UTF-8?q?[imp]=20=E5=88=9B=E5=BB=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=98=E9=87=8F=E6=94=AF=E6=8C=81=E4=B8=8D=E4=BC=A0?= =?UTF-8?q?userId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../choerodon/gitlab/api/controller/v1/ProjectsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java index f34306e..9debfd1 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java @@ -133,7 +133,7 @@ public ResponseEntity>> batchSaveVariableEvent( @ApiParam(value = "项目ID", required = true) @PathVariable Integer projectId, @ApiParam(value = "用户ID", required = true) - @RequestParam(value = "userId") Integer userId, + @RequestParam(value = "userId", required = false) Integer userId, @ApiParam(value = "variable信息", required = true) @RequestBody @Valid List list) { return Optional.ofNullable(projectService.batchCreateVariable(projectId, list, userId)) From 0d01960ccb37ef404a7d21a4d50e50e30caafef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 2 Aug 2022 14:59:56 +0800 Subject: [PATCH 20/41] =?UTF-8?q?[imp]=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/choerodon/gitlab/api/controller/v1/GroupsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java index db6b332..1005991 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java @@ -254,7 +254,7 @@ public ResponseEntity queryGroupByName( } @ApiOperation(value = "根据组id查询组") - @GetMapping(value = "/{group_iid}") + @GetMapping(value = "/query_by_id/{group_iid}") public ResponseEntity queryGroupByIid( @ApiParam(value = "组名", required = true) @PathVariable(value = "group_iid") Integer groupIid, From 19c88f82ea12dbe476b8443f23aab1e8bb8a55f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Tue, 2 Aug 2022 18:03:29 +0800 Subject: [PATCH 21/41] =?UTF-8?q?[ADD]=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2gitlab=E7=AE=A1=E7=90=86=E5=91=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/api/controller/v1/UserController.java | 13 +++++++++++++ .../choerodon/gitlab/app/service/UserService.java | 2 ++ .../gitlab/app/service/impl/UserServiceImpl.java | 11 +++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/UserController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/UserController.java index 852edcf..7f14f83 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/UserController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/UserController.java @@ -86,6 +86,19 @@ public ResponseEntity> list( .orElseThrow(() -> new FeignException("error.users.queryAll")); } + /** + * 查找所有admin用户 + * + * @return List + */ + @ApiOperation(value = "查找所有用户") + @GetMapping(value = "/list_admin_users") + public ResponseEntity> listAdminUsers() { + return Optional.ofNullable(userService.getAdminUsers()) + .map(target -> new ResponseEntity<>(target, HttpStatus.OK)) + .orElseThrow(() -> new FeignException("error.users.queryAll")); + } + /** * 根据用户ID获得用户信息 * diff --git a/src/main/java/io/choerodon/gitlab/app/service/UserService.java b/src/main/java/io/choerodon/gitlab/app/service/UserService.java index 90e03d1..0cbc780 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/UserService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/UserService.java @@ -10,6 +10,8 @@ public interface UserService { + List getAdminUsers(); + /** * 获得当前用户信息 * diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/UserServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/UserServiceImpl.java index 854a687..6d04b6f 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/UserServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/UserServiceImpl.java @@ -5,6 +5,7 @@ import org.gitlab4j.api.Constants; import org.gitlab4j.api.GitLabApiException; +import org.gitlab4j.api.Pager; import org.gitlab4j.api.UserApi; import org.gitlab4j.api.models.Email; import org.gitlab4j.api.models.ImpersonationToken; @@ -53,6 +54,16 @@ public List listUser(Integer perPage, Integer page, Boolean active) { } } + @Override + public List getAdminUsers() { + try { + Pager adminUsers = gitlab4jclient.getGitLabApi().getUserApi().getAdminUsers(1, 100); + return adminUsers.all(); + } catch (GitLabApiException e) { + throw new FeignException(e.getMessage(), e); + } + } + @Override public User queryCurrentUser() { try { From 19579576c943cec2c95403c526c94428e74148d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 8 Aug 2022 11:17:08 +0800 Subject: [PATCH 22/41] =?UTF-8?q?[imp]=20=E6=96=B0=E5=A2=9E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/ProjectsController.java | 14 ++++++++++++++ .../gitlab/app/service/ProjectService.java | 1 + .../app/service/impl/ProjectServiceImpl.java | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java index 9debfd1..5e80a82 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java @@ -476,6 +476,20 @@ public ResponseEntity> getAllMemberByProjectId( .map(result -> new ResponseEntity<>(result, HttpStatus.OK)) .orElseThrow(() -> new FeignException("error.project.member.list")); } + /** + * 获取项目下所有成员 + * + * @param projectId 项目id + * @return List + */ + @ApiOperation(value = "获取项目下所有成员") + @GetMapping(value = "/{project_id}/all_members/list") + public ResponseEntity> getAllMemberByProjectIdAndQuery( + @ApiParam(value = "项目id", required = true) + @PathVariable(value = "project_id") Integer projectId, + @RequestParam(value = "query") String query) { + return ResponseEntity.ok(projectService.getAllMemberByProjectIdAndQuery(projectId, query)); + } /** * 获取用户的gitlab项目列表 diff --git a/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java b/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java index a9c0d00..3c2b2f5 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java @@ -251,4 +251,5 @@ Map createProtectedBranches(Integer projectId, Project updateNameAndPath(Integer projectId, Integer userId, String name); + List getAllMemberByProjectIdAndQuery(Integer projectId, String query); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java index 15152a2..00142ec 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java @@ -317,4 +317,13 @@ public Project updateNameAndPath(Integer projectId, Integer userId, String name) throw new FeignException(e.getMessage(), e); } } + + @Override + public List getAllMemberByProjectIdAndQuery(Integer projectId, String query) { + try { + return gitlab4jclient.getGitLabApi().getProjectApi().getAllMembers(projectId, query, null); + } catch (GitLabApiException e) { + throw new FeignException(e.getMessage(), e); + } + } } \ No newline at end of file From 76a38643dd5e68b4056a6482e4ba5adfff690853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 8 Aug 2022 11:18:36 +0800 Subject: [PATCH 23/41] =?UTF-8?q?[imp]=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../choerodon/gitlab/app/service/impl/ProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java index 00142ec..4b165b9 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java @@ -321,7 +321,7 @@ public Project updateNameAndPath(Integer projectId, Integer userId, String name) @Override public List getAllMemberByProjectIdAndQuery(Integer projectId, String query) { try { - return gitlab4jclient.getGitLabApi().getProjectApi().getAllMembers(projectId, query, null); + return gitlab4jclient.getGitLabApi().getProjectApi().getAllMembers(projectId, query); } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } From 8c6808dae5d01d85851a5c40b97c14a6718f0ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 8 Aug 2022 20:06:31 +0800 Subject: [PATCH 24/41] [imp] update pom version --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index f0820b2..2d75fa0 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ io.choerodon choerodon-gitlab4j-api + 2.1.2.RELEASE org.springframework.boot From e842b66306e0aeacec33d96e1db91ad709da74b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 16 Aug 2022 11:28:22 +0800 Subject: [PATCH 25/41] =?UTF-8?q?[imp]=20=E6=B7=BB=E5=8A=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0webhook=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/api/controller/v1/HookController.java | 14 ++++++++++++++ .../choerodon/gitlab/app/service/HookService.java | 2 ++ .../gitlab/app/service/impl/HookServiceImpl.java | 9 +++++++++ 3 files changed, 25 insertions(+) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/HookController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/HookController.java index 6895dcd..9a88f1a 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/HookController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/HookController.java @@ -71,6 +71,20 @@ public ResponseEntity create( .orElseThrow(() -> new FeignException("error.projects.update.hook")); } + @ApiOperation(value = "更新ProjectHook对象") + @PutMapping("{hook_id}") + public ResponseEntity update( + @ApiParam(value = "项目ID", required = true) + @RequestParam Integer projectId, + @ApiParam(value = "userId") + @RequestParam(required = false) Integer userId, + @ApiParam(value = "hookId", required = true) + @PathVariable(value = "hook_id") Integer hookId, + @RequestBody @Valid ProjectHook projectHook) { + return Optional.ofNullable(hookService.updateProjectHook(projectId, hookId, userId, projectHook)) + .map(target -> new ResponseEntity<>(target, HttpStatus.NO_CONTENT)) + .orElseThrow(() -> new FeignException("error.projects.update.hook")); + } /** * 获取ProjectHook对象 diff --git a/src/main/java/io/choerodon/gitlab/app/service/HookService.java b/src/main/java/io/choerodon/gitlab/app/service/HookService.java index 51b4cde..7b987d0 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/HookService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/HookService.java @@ -22,4 +22,6 @@ public interface HookService { ProjectHook updateProjectHook(Integer projectId,Integer hookId, Integer userId); List listProjectHook(Integer projectId, Integer userId); + + ProjectHook updateProjectHook(Integer projectId, Integer hookId, Integer userId, ProjectHook projectHook); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/HookServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/HookServiceImpl.java index 1bfbf7d..34b4bed 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/HookServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/HookServiceImpl.java @@ -53,4 +53,13 @@ public List listProjectHook(Integer projectId,Integer userId) { } } + + @Override + public ProjectHook updateProjectHook(Integer projectId, Integer hookId, Integer userId, ProjectHook projectHook) { + try { + return gitlab4jclient.getGitLabApi(userId).getProjectApi().modifyHook(projectHook); + } catch (GitLabApiException e) { + throw new FeignException(e.getMessage(), e); + } + } } From 1186bc336ed7a9569fb68ba3cde62e8f18c09e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Mon, 22 Aug 2022 15:14:06 +0800 Subject: [PATCH 26/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/ProjectsController.java | 17 +++++++++++++++++ .../gitlab/app/service/ProjectService.java | 2 ++ .../app/service/impl/ProjectServiceImpl.java | 12 ++++++++++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java index 5e80a82..25fb63a 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java @@ -461,6 +461,23 @@ public ResponseEntity getMember( .orElseThrow(() -> new FeignException("error.groups.member.create")); } + /** + * 查询项目角色 + * + * @param projectId 项目id + * @param userId 用户Id + * @return Member + */ + @ApiOperation(value = "查询项目角色,包含继承的角色") + @GetMapping(value = "/{projectId}/members/all/{userId}") + public ResponseEntity getAllMember( + @ApiParam(value = "项目id", required = true) + @PathVariable(value = "projectId") Integer projectId, + @ApiParam(value = "成员信息", required = true) + @PathVariable(value = "userId") Integer userId) { + return ResponseEntity.ok(projectService.getAllMember(projectId, userId)); + } + /** * 获取项目下所有成员 * diff --git a/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java b/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java index 3c2b2f5..8f2d64c 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/ProjectService.java @@ -252,4 +252,6 @@ Map createProtectedBranches(Integer projectId, Project updateNameAndPath(Integer projectId, Integer userId, String name); List getAllMemberByProjectIdAndQuery(Integer projectId, String query); + + Member getAllMember(Integer projectId, Integer userId); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java index 4b165b9..077da04 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/ProjectServiceImpl.java @@ -326,4 +326,16 @@ public List getAllMemberByProjectIdAndQuery(Integer projectId, String qu throw new FeignException(e.getMessage(), e); } } + + @Override + public Member getAllMember(Integer projectId, Integer userId) { + try { + return gitlab4jclient.getGitLabApi().getProjectApi().getMember(projectId, userId, true); + } catch (GitLabApiException e) { + LOGGER.error("no member found"); + Member member = new Member(); + member.setAccessLevel(AccessLevel.NONE); + return member; + } + } } \ No newline at end of file From cb3a14ffa3330b6715024ee68647f8c6fed35028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 23 Aug 2022 10:59:08 +0800 Subject: [PATCH 27/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/GroupsController.java | 20 +++++++++++++++++++ .../gitlab/app/service/GroupService.java | 10 +++++++--- .../app/service/impl/GroupServiceImpl.java | 12 ++++++++++- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java index 1005991..40b4035 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.gitlab4j.api.Pager; import org.gitlab4j.api.models.*; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -122,6 +123,25 @@ public ResponseEntity> listMember( .orElseThrow(() -> new FeignException("error.groups.members.get")); } + /** + * 查询组中的成员 + * + * @param groupId 组对象Id + * @return List + */ + @ApiOperation(value = "分页查询成员列表") + @GetMapping(value = "/{groupId}/members/page") + public ResponseEntity> pageMember( + @ApiParam(value = "组ID", required = true) + @PathVariable Integer groupId, + @RequestParam Integer page, + @RequestParam Integer size, + @ApiParam(value = "用户userId") + @RequestParam(required = false) Integer userId, + @RequestParam(value = "search", required = false) String search) { + return ResponseEntity.ok(groupService.pageMember(groupId, page, size, userId, search)); + } + /** * 根据用户ID获得组成员信息 * diff --git a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java index 1db290a..5babdfa 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java @@ -1,11 +1,13 @@ package io.choerodon.gitlab.app.service; +import java.util.List; + +import org.gitlab4j.api.Pager; +import org.gitlab4j.api.models.*; + import io.choerodon.gitlab.api.vo.GroupVO; import io.choerodon.gitlab.api.vo.MemberVO; import io.choerodon.gitlab.api.vo.VariableVO; -import org.gitlab4j.api.models.*; - -import java.util.List; public interface GroupService { /** @@ -201,4 +203,6 @@ List batchCreateVariable(Integer groupId, List queryGroupWithStatisticsByName(String groupName, Integer userId, Boolean statistics); Group queryGroupByIid(Integer groupIid, Integer userId); + + Pager pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index 5689e73..1ee367d 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -7,13 +7,13 @@ import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.GroupApi; +import org.gitlab4j.api.Pager; import org.gitlab4j.api.models.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import io.choerodon.core.exception.CommonException; import io.choerodon.core.exception.FeignException; import io.choerodon.gitlab.api.vo.GroupVO; import io.choerodon.gitlab.api.vo.MemberVO; @@ -299,4 +299,14 @@ public Group queryGroupByIid(Integer groupIid, Integer userId) { throw new FeignException(e.getMessage(), e); } } + + @Override + public Pager pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search) { + GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); + try { + return gitLabApi.getGroupApi().getAllMembers(groupId, search, null, page, size); + } catch (GitLabApiException e) { + throw new FeignException(e.getMessage(), e); + } + } } \ No newline at end of file From 959641a61f9a846796fc8552c56c5657ceac6aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 23 Aug 2022 11:53:32 +0800 Subject: [PATCH 28/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/api/controller/v1/GroupsController.java | 4 ++-- .../java/io/choerodon/gitlab/app/service/GroupService.java | 4 ++-- .../gitlab/app/service/impl/GroupServiceImpl.java | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java index 40b4035..72c178f 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java @@ -6,13 +6,13 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.gitlab4j.api.Pager; import org.gitlab4j.api.models.*; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import io.choerodon.core.domain.Page; import io.choerodon.core.exception.FeignException; import io.choerodon.gitlab.api.vo.GitlabTransferVO; import io.choerodon.gitlab.api.vo.GroupVO; @@ -131,7 +131,7 @@ public ResponseEntity> listMember( */ @ApiOperation(value = "分页查询成员列表") @GetMapping(value = "/{groupId}/members/page") - public ResponseEntity> pageMember( + public ResponseEntity> pageMember( @ApiParam(value = "组ID", required = true) @PathVariable Integer groupId, @RequestParam Integer page, diff --git a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java index 5babdfa..a9948cb 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java @@ -2,9 +2,9 @@ import java.util.List; -import org.gitlab4j.api.Pager; import org.gitlab4j.api.models.*; +import io.choerodon.core.domain.Page; import io.choerodon.gitlab.api.vo.GroupVO; import io.choerodon.gitlab.api.vo.MemberVO; import io.choerodon.gitlab.api.vo.VariableVO; @@ -204,5 +204,5 @@ List batchCreateVariable(Integer groupId, Group queryGroupByIid(Integer groupIid, Integer userId); - Pager pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search); + Page pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index 1ee367d..badf242 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -14,6 +14,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import io.choerodon.core.domain.Page; +import io.choerodon.core.domain.PageInfo; import io.choerodon.core.exception.FeignException; import io.choerodon.gitlab.api.vo.GroupVO; import io.choerodon.gitlab.api.vo.MemberVO; @@ -301,10 +303,11 @@ public Group queryGroupByIid(Integer groupIid, Integer userId) { } @Override - public Pager pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search) { + public Page pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search) { GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); try { - return gitLabApi.getGroupApi().getAllMembers(groupId, search, null, page, size); + Pager allMembers = gitLabApi.getGroupApi().getAllMembers(groupId, search, null, page, size); + return new Page<>(allMembers.current(), new PageInfo(allMembers.getCurrentPage(), allMembers.getItemsPerPage()), allMembers.getTotalItems()); } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } From 463c085586ba3c5aa5093e610d60282ef015f0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 23 Aug 2022 17:51:03 +0800 Subject: [PATCH 29/41] =?UTF-8?q?[IMP]=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../choerodon/gitlab/api/controller/v1/ProjectsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java index 25fb63a..3edccca 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/ProjectsController.java @@ -323,7 +323,7 @@ public ResponseEntity> getDeployKeys( @ApiParam(value = "项目ID", required = true) @RequestParam Integer projectId, @ApiParam(value = "用户Id") - @RequestParam Integer userId) { + @RequestParam(required = false) Integer userId) { return Optional.ofNullable(projectService.getDeployKeys(projectId, userId)) .map(target -> new ResponseEntity<>(target, HttpStatus.OK)) .orElseThrow(() -> new FeignException("error.project.deploy.key.get")); From 14ae3f451e9988616ededac5dc73c83a5ec86fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 23 Aug 2022 23:07:19 +0800 Subject: [PATCH 30/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9C=89=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/GroupsController.java | 17 +++++++++++++++++ .../gitlab/app/service/GroupService.java | 2 ++ .../app/service/impl/GroupServiceImpl.java | 13 +++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java index 72c178f..dea6cc3 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java @@ -45,6 +45,23 @@ public ResponseEntity> list(@ApiParam(value = "userId") return ResponseEntity.ok(groupService.listGroupsWithParam(userId, owned, search, skipGroups)); } + /** + * 分页查询所有组 + * + * @return List + */ + @ApiOperation(value = "分页查询有权限的所有组") + @PostMapping("/{userId}/paging") + public ResponseEntity> paging(@ApiParam(value = "userId") + @PathVariable(value = "userId") Integer userId, + @RequestParam(value = "page") Integer page, + @RequestParam(value = "size") Integer size, + @RequestParam(value = "owned", required = false) Boolean owned, + @RequestParam(value = "search", required = false) String search, + @RequestBody List skipGroups) { + return ResponseEntity.ok(groupService.pagingGroupsWithParam(userId, page, size, owned, search, skipGroups)); + } + /** * 查询所有组 * diff --git a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java index a9948cb..df197f4 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java @@ -205,4 +205,6 @@ List batchCreateVariable(Integer groupId, Group queryGroupByIid(Integer groupIid, Integer userId); Page pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search); + + Page pagingGroupsWithParam(Integer userId, Integer page, Integer size, Boolean owned, String search, List skipGroups); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index badf242..bbd2925 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -312,4 +312,17 @@ public Page pageMember(Integer groupId, Integer page, Integer size, Inte throw new FeignException(e.getMessage(), e); } } + + @Override + public Page pagingGroupsWithParam(Integer userId, Integer page, Integer size, Boolean owned, String search, List skipGroups) { + GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); + try { + GroupFilter groupFilter = new GroupFilter(); + groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search); + Pager groups = gitLabApi.getGroupApi().getGroups(groupFilter, page, size); + return new Page<>(groups.current(), new PageInfo(groups.getCurrentPage(), groups.getItemsPerPage()), groups.getTotalItems()); + } catch (GitLabApiException e) { + throw new FeignException(e.getMessage(), e); + } + } } \ No newline at end of file From 79e6fdca172a2757f14cccafb757a68163688c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 23 Aug 2022 23:46:32 +0800 Subject: [PATCH 31/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9C=89=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/GroupServiceImpl.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index bbd2925..801fe90 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -15,7 +15,6 @@ import org.springframework.stereotype.Service; import io.choerodon.core.domain.Page; -import io.choerodon.core.domain.PageInfo; import io.choerodon.core.exception.FeignException; import io.choerodon.gitlab.api.vo.GroupVO; import io.choerodon.gitlab.api.vo.MemberVO; @@ -307,7 +306,13 @@ public Page pageMember(Integer groupId, Integer page, Integer size, Inte GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); try { Pager allMembers = gitLabApi.getGroupApi().getAllMembers(groupId, search, null, page, size); - return new Page<>(allMembers.current(), new PageInfo(allMembers.getCurrentPage(), allMembers.getItemsPerPage()), allMembers.getTotalItems()); + Page members = new Page<>(); + members.setContent(allMembers.current()); + members.setSize(allMembers.getItemsPerPage()); + members.setNumber(allMembers.getCurrentPage()); + members.setTotalElements(allMembers.getTotalItems()); + members.setTotalPages(allMembers.getTotalPages()); + return members; } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } @@ -320,7 +325,13 @@ public Page pagingGroupsWithParam(Integer userId, Integer page, Integer s GroupFilter groupFilter = new GroupFilter(); groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search); Pager groups = gitLabApi.getGroupApi().getGroups(groupFilter, page, size); - return new Page<>(groups.current(), new PageInfo(groups.getCurrentPage(), groups.getItemsPerPage()), groups.getTotalItems()); + Page groupPage = new Page<>(); + groupPage.setContent(groups.current()); + groupPage.setSize(groups.getItemsPerPage()); + groupPage.setNumber(groups.getCurrentPage()); + groupPage.setTotalElements(groups.getTotalItems()); + groupPage.setTotalPages(groups.getTotalPages()); + return groupPage; } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } From c96e5d44fe93b7cbf70c8c453ff2ae0d11229831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Wed, 24 Aug 2022 00:12:07 +0800 Subject: [PATCH 32/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9C=89=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/GroupServiceImpl.java | 17 +++-------------- src/main/resources/application.yml | 4 ++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index 801fe90..fd55ed3 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import io.choerodon.core.domain.Page; +import io.choerodon.core.domain.PageInfo; import io.choerodon.core.exception.FeignException; import io.choerodon.gitlab.api.vo.GroupVO; import io.choerodon.gitlab.api.vo.MemberVO; @@ -306,13 +307,7 @@ public Page pageMember(Integer groupId, Integer page, Integer size, Inte GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); try { Pager allMembers = gitLabApi.getGroupApi().getAllMembers(groupId, search, null, page, size); - Page members = new Page<>(); - members.setContent(allMembers.current()); - members.setSize(allMembers.getItemsPerPage()); - members.setNumber(allMembers.getCurrentPage()); - members.setTotalElements(allMembers.getTotalItems()); - members.setTotalPages(allMembers.getTotalPages()); - return members; + return new Page<>(allMembers.getCurrentItems(), new PageInfo(allMembers.getCurrentPage(), allMembers.getItemsPerPage()), allMembers.getTotalItems()); } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } @@ -325,13 +320,7 @@ public Page pagingGroupsWithParam(Integer userId, Integer page, Integer s GroupFilter groupFilter = new GroupFilter(); groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search); Pager groups = gitLabApi.getGroupApi().getGroups(groupFilter, page, size); - Page groupPage = new Page<>(); - groupPage.setContent(groups.current()); - groupPage.setSize(groups.getItemsPerPage()); - groupPage.setNumber(groups.getCurrentPage()); - groupPage.setTotalElements(groups.getTotalItems()); - groupPage.setTotalPages(groups.getTotalPages()); - return groupPage; + return new Page<>(groups.getCurrentItems(), new PageInfo(groups.getCurrentPage(), groups.getItemsPerPage()), groups.getTotalItems()); } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 936e151..f30295c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,8 +10,8 @@ spring: host: localhost database: ${SPRING_REDIS_DATABASE:1} gitlab: - url: "http://git.example.com" - privateToken: "inputprivatetoken" + url: "https://gitlabtest.ctyun.cn/" + privateToken: "glpat-vLsA6dqXQsbaqKVnwF6A" eureka: instance: preferIpAddress: true From 3432c36830e9fc745b10adaa043c9a8a96781e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Wed, 24 Aug 2022 00:12:27 +0800 Subject: [PATCH 33/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9C=89=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f30295c..936e151 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,8 +10,8 @@ spring: host: localhost database: ${SPRING_REDIS_DATABASE:1} gitlab: - url: "https://gitlabtest.ctyun.cn/" - privateToken: "glpat-vLsA6dqXQsbaqKVnwF6A" + url: "http://git.example.com" + privateToken: "inputprivatetoken" eureka: instance: preferIpAddress: true From 34d407321a066090aae54519bd41a1171510ac0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Wed, 24 Aug 2022 00:14:54 +0800 Subject: [PATCH 34/41] =?UTF-8?q?[IMP]=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9C=89=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/app/service/impl/GroupServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index fd55ed3..c0b75ad 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -306,8 +306,8 @@ public Group queryGroupByIid(Integer groupIid, Integer userId) { public Page pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search) { GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); try { - Pager allMembers = gitLabApi.getGroupApi().getAllMembers(groupId, search, null, page, size); - return new Page<>(allMembers.getCurrentItems(), new PageInfo(allMembers.getCurrentPage(), allMembers.getItemsPerPage()), allMembers.getTotalItems()); + Pager allMembers = gitLabApi.getGroupApi().getAllMembers(groupId, search, null, page + 1, size); + return new Page<>(allMembers.getCurrentItems(), new PageInfo(page, size), allMembers.getTotalItems()); } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } @@ -319,8 +319,8 @@ public Page pagingGroupsWithParam(Integer userId, Integer page, Integer s try { GroupFilter groupFilter = new GroupFilter(); groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search); - Pager groups = gitLabApi.getGroupApi().getGroups(groupFilter, page, size); - return new Page<>(groups.getCurrentItems(), new PageInfo(groups.getCurrentPage(), groups.getItemsPerPage()), groups.getTotalItems()); + Pager groups = gitLabApi.getGroupApi().getGroups(groupFilter, page + 1, size); + return new Page<>(groups.getCurrentItems(), new PageInfo(page, size), groups.getTotalItems()); } catch (GitLabApiException e) { throw new FeignException(e.getMessage(), e); } From afeed1b3ec8a5c84e0c32801370d5641b7475668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Fri, 9 Sep 2022 10:48:27 +0800 Subject: [PATCH 35/41] =?UTF-8?q?[IMP]=20=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d75fa0..b114b66 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.2.0-SNAPSHOT + 2.2.0-beta-SNAPSHOT jar https://github.com/choerodon/gitlab-service @@ -12,7 +12,7 @@ io.choerodon choerodon-framework-parent - 2.1.1.RELEASE + 2.2.0-beta.1.RELEASE From 0c054a6710f4f81325b504d199aa3d8db03376a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Fri, 9 Sep 2022 11:04:03 +0800 Subject: [PATCH 36/41] =?UTF-8?q?[IMP]=20=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 270 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 135 insertions(+), 135 deletions(-) diff --git a/pom.xml b/pom.xml index 2d75fa0..68eaec9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,135 +1,135 @@ - - - 4.0.0 - - gitlab-service - 2.2.0-SNAPSHOT - jar - https://github.com/choerodon/gitlab-service - - - - io.choerodon - choerodon-framework-parent - 2.1.1.RELEASE - - - - app - - - - true - io.choerodon.gitlab.GitlabServiceApplication - - - - - io.choerodon - choerodon-starter-limit - - - org.springframework.data - spring-data-redis - - - - org.hzero.starter - hzero-starter-core - - - fastjson - com.alibaba - - - - - org.hzero.starter - hzero-starter-feign-replay - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.9.0 - - - io.choerodon - choerodon-gitlab4j-api - 2.1.2.RELEASE - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-undertow - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - org.springframework.cloud - spring-cloud-config-client - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.retry - spring-retry - - - - junit - junit - 4.12 - test - - - com.google.code.gson - gson - 2.6.2 - - - org.eclipse.jgit - org.eclipse.jgit - - - commons-io - commons-io - 2.4 - - - org.springframework.boot - spring-boot-starter-test - test - - - org.toile-libre.libe - curl - LATEST - - - - - + + + 4.0.0 + + gitlab-service + 2.2.0-20-SNAPSHOT + jar + https://github.com/choerodon/gitlab-service + + + + io.choerodon + choerodon-framework-parent + 2.2.0-20-SNAPSHOT + + + + app + + + + true + io.choerodon.gitlab.GitlabServiceApplication + + + + + io.choerodon + choerodon-starter-limit + + + org.springframework.data + spring-data-redis + + + + org.hzero.starter + hzero-starter-core + + + fastjson + com.alibaba + + + + + org.hzero.starter + hzero-starter-feign-replay + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.9.0 + + + io.choerodon + choerodon-gitlab4j-api + 2.1.2.RELEASE + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.cloud + spring-cloud-config-client + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.retry + spring-retry + + + + junit + junit + 4.12 + test + + + com.google.code.gson + gson + 2.6.2 + + + org.eclipse.jgit + org.eclipse.jgit + + + commons-io + commons-io + 2.4 + + + org.springframework.boot + spring-boot-starter-test + test + + + org.toile-libre.libe + curl + LATEST + + + + + From af5c0279d976708a0be53a83ddce85749956d6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Tue, 20 Sep 2022 17:25:12 +0800 Subject: [PATCH 37/41] =?UTF-8?q?[imp]=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../choerodon/gitlab/api/controller/v1/GroupsController.java | 3 ++- .../java/io/choerodon/gitlab/app/service/GroupService.java | 2 +- .../choerodon/gitlab/app/service/impl/GroupServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java index dea6cc3..2297f50 100644 --- a/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java +++ b/src/main/java/io/choerodon/gitlab/api/controller/v1/GroupsController.java @@ -58,8 +58,9 @@ public ResponseEntity> paging(@ApiParam(value = "userId") @RequestParam(value = "size") Integer size, @RequestParam(value = "owned", required = false) Boolean owned, @RequestParam(value = "search", required = false) String search, + @RequestParam(value = "minAccessLevel", required = false) Integer minAccessLevel, @RequestBody List skipGroups) { - return ResponseEntity.ok(groupService.pagingGroupsWithParam(userId, page, size, owned, search, skipGroups)); + return ResponseEntity.ok(groupService.pagingGroupsWithParam(userId, page, size, owned, search, skipGroups,minAccessLevel)); } /** diff --git a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java index df197f4..0e22653 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/GroupService.java +++ b/src/main/java/io/choerodon/gitlab/app/service/GroupService.java @@ -206,5 +206,5 @@ List batchCreateVariable(Integer groupId, Page pageMember(Integer groupId, Integer page, Integer size, Integer userId, String search); - Page pagingGroupsWithParam(Integer userId, Integer page, Integer size, Boolean owned, String search, List skipGroups); + Page pagingGroupsWithParam(Integer userId, Integer page, Integer size, Boolean owned, String search, List skipGroups, Integer minAccessLevel); } diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index c0b75ad..baaaf83 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -314,11 +314,11 @@ public Page pageMember(Integer groupId, Integer page, Integer size, Inte } @Override - public Page pagingGroupsWithParam(Integer userId, Integer page, Integer size, Boolean owned, String search, List skipGroups) { + public Page pagingGroupsWithParam(Integer userId, Integer page, Integer size, Boolean owned, String search, List skipGroups, Integer minAccessLevel) { GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); try { GroupFilter groupFilter = new GroupFilter(); - groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search); + groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search).withMinAccessLevel(AccessLevel.forValue(minAccessLevel)); Pager groups = gitLabApi.getGroupApi().getGroups(groupFilter, page + 1, size); return new Page<>(groups.getCurrentItems(), new PageInfo(page, size), groups.getTotalItems()); } catch (GitLabApiException e) { From fda734baa99b20e445aa7c856af00ddf52e05ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Wed, 21 Sep 2022 10:24:57 +0800 Subject: [PATCH 38/41] =?UTF-8?q?[imp]=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../choerodon/gitlab/app/service/impl/GroupServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java index baaaf83..e3b8a66 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/GroupServiceImpl.java @@ -318,7 +318,11 @@ public Page pagingGroupsWithParam(Integer userId, Integer page, Integer s GitLabApi gitLabApi = gitlab4jclient.getGitLabApi(userId); try { GroupFilter groupFilter = new GroupFilter(); - groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search).withMinAccessLevel(AccessLevel.forValue(minAccessLevel)); + if (minAccessLevel != null) { + groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search).withMinAccessLevel(AccessLevel.forValue(minAccessLevel)); + } else { + groupFilter.withSkipGroups(skipGroups).withOwned(owned).withSearch(search); + } Pager groups = gitLabApi.getGroupApi().getGroups(groupFilter, page + 1, size); return new Page<>(groups.getCurrentItems(), new PageInfo(page, size), groups.getTotalItems()); } catch (GitLabApiException e) { From fc1075decf61f1ea5592dffee1a99b8a75fd680b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=81=8F?= Date: Fri, 23 Sep 2022 21:11:03 +0800 Subject: [PATCH 39/41] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c43310..8727b04 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gitlab-service - 2.1.2-SNAPSHOT + 2.1.2.RELEASE jar https://github.com/choerodon/gitlab-service From 4236057dd8a8acf82428298acf30576f7bf275bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Thu, 29 Sep 2022 15:02:25 +0800 Subject: [PATCH 40/41] =?UTF-8?q?[IMP]=20=E4=BF=AE=E5=A4=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitlab/app/service/impl/MergeRequestServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/choerodon/gitlab/app/service/impl/MergeRequestServiceImpl.java b/src/main/java/io/choerodon/gitlab/app/service/impl/MergeRequestServiceImpl.java index 9bb26f9..e5985a3 100644 --- a/src/main/java/io/choerodon/gitlab/app/service/impl/MergeRequestServiceImpl.java +++ b/src/main/java/io/choerodon/gitlab/app/service/impl/MergeRequestServiceImpl.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.stream.Collectors; +import org.gitlab4j.api.Constants; import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.models.Commit; import org.gitlab4j.api.models.MergeRequest; @@ -68,7 +69,7 @@ public MergeRequest queryMergeRequest(Integer projectId, Integer mergeRequestId, public List listMergeRequests(Integer projectId) { try { return gitlab4jclient.getGitLabApi(null).getMergeRequestApi() - .getMergeRequests(projectId); + .getMergeRequests(projectId, Constants.MergeRequestState.ALL); } catch (GitLabApiException e) { throw new FeignException("error.mergeRequests.list"); } From def9df8f0de339d9724fa74c44da54f12a2f65e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 22:33:24 +0000 Subject: [PATCH 41/41] Bump gson from 2.6.2 to 2.8.9 Bumps [gson](https://github.com/google/gson) from 2.6.2 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.6.2...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17156d1..8276dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ com.google.code.gson gson - 2.6.2 + 2.8.9 org.eclipse.jgit