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 e1305ab36..b84f365d8 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 @@ -160,7 +160,7 @@ public class GitLinkRequestUrl { } public static GitLinkRequestUrl GET_FILE_SUB_ENTRIES(String repoOwner, String repoIdentifier, String filepath, String ref) { - return getOpenGitLinkRequestUrl( + return getGitLinkRequestUrl( String.format("/api/%s/%s/sub_entries.json?filepath=%s&ref=%s&type=%s", repoOwner, repoIdentifier, URLEncoder.encode(filepath), ref, "file") ); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java index 98d1984e2..5d5c3e29f 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java @@ -498,7 +498,9 @@ public class PmsCiPipelinesServiceImpl implements IPmsCiPipelinesService { PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseByIdentifier(enterpriseIdentifier); PmsCiPipelines pmsCiPipelines = new PmsCiPipelines(); BeanUtils.copyProperties(pmsCiPipelinesInputVo, pmsCiPipelines); - pmsCiPipelines.setPipelineTemplateJson(JSON.toJSONString(pmsCiPipelinesInputVo.getPipelineTemplateJson())); + if (pmsCiPipelinesInputVo.getPipelineTemplateJson() != null) { + pmsCiPipelines.setPipelineTemplateJson(JSON.toJSONString(pmsCiPipelinesInputVo.getPipelineTemplateJson())); + } pmsCiPipelines.setDeptId(pmsEnterprise.getDeptId()); pmsCiPipelines.setPmsEnterpriseId(pmsEnterprise.getId()); Date nowDate = DateUtils.getNowDate();