mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mianbin:430086cfa83d1c0a4226c1245b97312fafc6bced
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp
..
compare: mianbin:6b457250d77d6a466adf945181147ca886f11500
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp

No commits in common. "430086cfa83d1c0a4226c1245b97312fafc6bced" and "6b457250d77d6a466adf945181147ca886f11500" have entirely different histories.
430086cfa8 ... 6b457250d7

3 changed files with 6 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/context/ConstantContextHolder.java
View File

@ -52,6 +52,6 @@ public class ConstantContextHolder {
* SCA默认写死
*/
public static String getScaToken() {
return getSysConfigWithDefault("OPS_TOKEN_SCA", String.class, "9a4fcaeba3b54de1add6395b08217e5e");
return getSysConfigWithDefault("OPS_TOKEN_SCA", String.class, "6b906a14493644af801efbcdee7cd390");
}
}

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/base/BaseIdPageReq.java
View File

@ -18,5 +18,5 @@ public class BaseIdPageReq extends PageParam {
private List<String> idList;
private String pid;
private String childId;
private Integer projectId;
private String projectId;
}

11
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java
View File

@ -17,7 +17,6 @@ import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;
import java.security.KeyManagementException;
@ -42,7 +41,7 @@ public class ReportServiceImpl implements ReportService {
@Override
public PageResult<ReportResp> findReportList(BaseIdPageReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
RestTemplate restTemplate = getRestTemplateWithoutSANCheck();
String reportFindUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/list";
String reportFindUrl = ConstantContextHolder.getScaIp() + "openapi/v1/asset/report/list";
MultiValueMap<String, Object> body = buildFindRequestBody(req);
HttpHeaders headers = createHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
@ -72,7 +71,7 @@ public class ReportServiceImpl implements ReportService {
@Override
public ReportResp deleteReport(ReportDeleteReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
RestTemplate restTemplate = getRestTemplateWithoutSANCheck();
String reportDeleteUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/delet";
String reportDeleteUrl = ConstantContextHolder.getScaIp() + "openapi/v1/asset/report/delet";
MultiValueMap<String, Object> body = buildDeleteRequestBody(req);
HttpHeaders headers = createHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
@ -101,7 +100,7 @@ public class ReportServiceImpl implements ReportService {
@Override
public String downLoadReport(BaseIdReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
RestTemplate restTemplate = getRestTemplateWithoutSANCheck();
String reportDeleteUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/downLoadReport/batch";
String reportDeleteUrl = ConstantContextHolder.getScaIp() + "openapi/v1/asset/report/downLoadReport/batch";
MultiValueMap<String, Object> body = buildDownloadRequestBody(req);
HttpHeaders headers = createHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
@ -134,9 +133,7 @@ public class ReportServiceImpl implements ReportService {
private MultiValueMap<String, Object> buildFindRequestBody(BaseIdPageReq req) {
MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
if (!ObjectUtils.isEmpty(req.getProjectId())){
body.add("projectId", req.getProjectId());
}
body.add("projectId", req.getProjectId());
body.add("pageNum", req.getPageNo());
body.add("pageSize", req.getPageSize());
return body;