yystopf
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '从gitlink获取文件entries接口改为需要授权请求' (#585) from wanjia9506/microservices:dev_PMS into dev_PMS

This commit is contained in:
wanjia9506 2024-06-26 17:28:58 +08:00
parent 3e93dde5f1 f57cd3152a
commit 7e237ce650
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microservices-common/microservices-common-httpClient/src/main/java/com/microservices/common/httpClient/domain/GitLinkRequestUrl.java
View File

@ -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")
);
}

4
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java
View File

@ -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();