wolfboys commented on code in PR #3630:
URL:
https://github.com/apache/incubator-streampark/pull/3630#discussion_r1539234115
##########
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java:
##########
@@ -94,7 +100,17 @@ public RestResponse create(Project project) {
RestResponse response = RestResponse.success();
ApiAlertException.throwIfTrue(count > 0, "project name already exists, add
project failed");
-
+ if (StringUtils.isNotBlank(project.getPassword())) {
Review Comment:
We can make the code more cleaner:
```
@Override
public boolean update(Project projectParam) {
Project project = getById(projectParam.getId());
AssertUtils.notNull(project);
ApiAlertException.throwIfFalse(
project.getTeamId().equals(projectParam.getTeamId()),
"TeamId can't be changed, update project failed.");
ApiAlertException.throwIfFalse(
!project.getBuildState().equals(BuildStateEnum.BUILDING.get()),
"The project is being built, update project failed.");
updateInternal(projectParam, project);
if (project.isHttpRepositoryUrl()) {
if (StringUtils.isBlank(projectParam.getUserName())) {
project.setUserName(null);
project.setPassword(null);
project.setSalt(null);
} else {
project.setUserName(projectParam.getUserName());
if (!Objects.equals(projectParam.getPassword(),
project.getPassword())) {
try {
String salt = ShaHashUtils.getRandomSalt();
String encrypt =
EncryptUtils.encrypt(projectParam.getPassword(), salt);
project.setPassword(encrypt);
project.setSalt(salt);
} catch (Exception e) {
log.error("project password encrypt failed");
throw new ApiAlertException(e);
}
}
}
}
if (projectParam.getBuildState() != null) {
project.setBuildState(projectParam.getBuildState());
if (BuildStateEnum.NEED_REBUILD ==
BuildStateEnum.of(projectParam.getBuildState())) {
List<Application> applications = listApps(project);
// Update deployment status
applications.forEach(
(app) -> {
log.info(
"update deploy by project: {}, appName:{}",
project.getName(), app.getJobName());
app.setRelease(ReleaseStateEnum.NEED_CHECK.get());
applicationManageService.updateRelease(app);
});
}
}
baseMapper.updateById(project);
return true;
}
private static void updateInternal(Project projectParam, Project project) {
project.setName(projectParam.getName());
project.setUrl(projectParam.getUrl());
project.setBranches(projectParam.getBranches());
project.setPrvkeyPath(projectParam.getPrvkeyPath());
project.setPom(projectParam.getPom());
project.setDescription(projectParam.getDescription());
project.setBuildArgs(projectParam.getBuildArgs());
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
