test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-04 12:58:24 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix npe

Browse Source
This commit is contained in:
bwcx_jzy 2021-09-14 20:54:52 +08:00
parent c9ffab14f5
commit 697861fef3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/server/src/main/java/io/jpom/controller/build/BuildInfoController.java
View File

@ -180,12 +180,11 @@ public class BuildInfoController extends BaseServerController {
}
// 检查关联数据ID
buildInfoModel.setReleaseMethodDataId(jsonObject.getString("releaseMethodDataId"));
// 设置属性
buildInfoModel.setReleaseMethod(releaseMethod1.getCode());
if (buildInfoModel.getReleaseMethod() != BuildReleaseMethod.No.getCode()) {
Assert.hasText(buildInfoModel.getReleaseMethodDataId(), "没有发布分发对应关联数据ID");
}
// 设置属性
buildInfoModel.setReleaseMethod(releaseMethod1.getCode());
buildInfoModel.setExtraData(jsonObject.toJSONString());
// 新增构建信息

1
modules/server/src/main/java/io/jpom/controller/build/RepositoryController.java
View File

@ -77,6 +77,7 @@ public class RepositoryController extends BaseServerController {
pageResult.forEach(repositoryModel -> {
// 隐藏密码字段
repositoryModel.setPassword(null);
repositoryModel.setRsaPrv(null);
});
JSONObject jsonObject = JsonMessage.toJson(200, "获取成功", pageResult);
jsonObject.put("total", pageResult.getTotal());

4
modules/server/src/main/java/io/jpom/model/data/RepositoryModel.java
View File

@ -147,8 +147,8 @@ public class RepositoryModel extends BaseDbModel {
Git(0, "Git"),
Svn(1, "Svn"),
;
private int code;
private String desc;
private final int code;
private final String desc;
RepoType(int code, String desc) {
this.code = code;