...
|
...
|
@@ -51,7 +51,7 @@ public class WorkSystemCtrl { |
|
|
public ModelAndView toAddWork(Model model) {
|
|
|
|
|
|
model.addAttribute("platforms", Platform.getPlatforms());
|
|
|
model.addAttribute("dockerEnvironments", ProjectEnvironment.getDockerEnvironments());
|
|
|
//model.addAttribute("dockerEnvironments", ProjectEnvironment.getDockerEnvironments(null));
|
|
|
model.addAttribute("projectTypes", ProjectEnvironment.getDockerProjectTypeMap());
|
|
|
BaseResponse<List<User>> resp = httpRestClient.exchangeForget(HttpUriContants.GET_All_USER, new ParameterizedTypeReference<BaseResponse<List<User>>>() {
|
|
|
}, null);
|
...
|
...
|
@@ -162,7 +162,7 @@ public class WorkSystemCtrl { |
|
|
}
|
|
|
}
|
|
|
}else if (Platform.DOCKER.equals(platform)) {
|
|
|
envs.addAll(ProjectEnvironment.getDockerEnvironments());
|
|
|
envs.addAll(ProjectEnvironment.getDockerEnvironments(projects));
|
|
|
}
|
|
|
return envs;
|
|
|
}
|
...
|
...
|
|