Commit 0f092fb9 authored by 黎博's avatar 黎博

修改repo/getAll字段名

parent 1b9ad3d4
...@@ -586,8 +586,8 @@ public class K8sController { ...@@ -586,8 +586,8 @@ public class K8sController {
TagInfo[] tagInfos = imageService.getImageListByService(repoInfo.getRepoName()).getTagInfo(); TagInfo[] tagInfos = imageService.getImageListByService(repoInfo.getRepoName()).getTagInfo();
for (TagInfo tagInfo: tagInfos) { for (TagInfo tagInfo: tagInfos) {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("appname", serviceName + ":" + tagInfo.getTagName()); map.put("serviceName", serviceName + ":" + tagInfo.getTagName());
map.put("type", serviceName); map.put("serviceType", serviceName);
map.put("label", "base"); map.put("label", "base");
map.put("tag", "qa-base/" + serviceName + ":" + tagInfo.getTagName()); map.put("tag", "qa-base/" + serviceName + ":" + tagInfo.getTagName());
map.put("domain", serviceName + tagInfo.getTagName()); map.put("domain", serviceName + tagInfo.getTagName());
...@@ -613,9 +613,9 @@ public class K8sController { ...@@ -613,9 +613,9 @@ public class K8sController {
List<DockerProject> dockerProjectList = dockerProjectService.list(queryWrapper); List<DockerProject> dockerProjectList = dockerProjectService.list(queryWrapper);
for (DockerProject dockerProject: dockerProjectList) { for (DockerProject dockerProject: dockerProjectList) {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("type", type); map.put("serviceType", type);
map.put("label", type); map.put("label", type);
map.put("appname", dockerProject.getProjectName()); map.put("serviceName", dockerProject.getProjectName());
map.put("domain", dockerProject.getHostName().split("\\.")[0]); map.put("domain", dockerProject.getHostName().split("\\.")[0]);
map.put("tag", "qa-test/" + dockerProject.getProjectName() + ":latest"); map.put("tag", "qa-test/" + dockerProject.getProjectName() + ":latest");
serviceMapList.add(map); serviceMapList.add(map);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment