| @@ -63,7 +63,7 @@ public class ImageServiceImpl implements ImageService { | |||||
| private MinioService minioService; | private MinioService minioService; | ||||
| @Value("${minio.dataReleaseBucketName}") | @Value("${minio.dataReleaseBucketName}") | ||||
| private String bucketName; | private String bucketName; | ||||
| // @Value("${harbor.bucketName}") | |||||
| // @Value("${harbor.bucketName}") | |||||
| // private String bucketName; | // private String bucketName; | ||||
| @Value("${harbor.repository}") | @Value("${harbor.repository}") | ||||
| private String repository; | private String repository; | ||||
| @@ -184,12 +184,14 @@ public class ImageServiceImpl implements ImageService { | |||||
| // } | // } | ||||
| List<ImageVersion> imageVersions = imageVersionService.queryByImageId(id); | List<ImageVersion> imageVersions = imageVersionService.queryByImageId(id); | ||||
| for (ImageVersion imageVersion :imageVersions) { | |||||
| dockerClientUtil.removeImage(imageVersion.getUrl(), imageVersion.getHostIp()); | |||||
| for (ImageVersion imageVersion : imageVersions) { | |||||
| if (StringUtils.isNotEmpty(imageVersion.getHostIp())) { | |||||
| dockerClientUtil.removeImage(imageVersion.getUrl(), imageVersion.getHostIp()); | |||||
| } | |||||
| } | } | ||||
| image.setState(0); | image.setState(0); | ||||
| return this.imageDao.update(image) > 0 ? "删除成功" : "删除失败"; | |||||
| return this.imageDao.update(image) > 0 ? "删除成功" : "删除失败"; | |||||
| } | } | ||||
| @@ -376,10 +378,10 @@ public class ImageServiceImpl implements ImageService { | |||||
| if (oldImage != null) { | if (oldImage != null) { | ||||
| List<ImageVersion> oldImageVersions = imageVersionDao.queryByImageId(oldImage.getId()); | List<ImageVersion> oldImageVersions = imageVersionDao.queryByImageId(oldImage.getId()); | ||||
| for (ImageVersion oldImageVersion : oldImageVersions) { | for (ImageVersion oldImageVersion : oldImageVersions) { | ||||
| if(oldImageVersion.getTagName().equals(imageVo.getTagName())){ | |||||
| if (oldImageVersion.getTagName().equals(imageVo.getTagName())) { | |||||
| throw new IllegalStateException("镜像tag不能重复"); | throw new IllegalStateException("镜像tag不能重复"); | ||||
| } | } | ||||
| } | |||||
| } | |||||
| } | } | ||||
| LoginUser loginUser = SecurityUtils.getLoginUser(); | LoginUser loginUser = SecurityUtils.getLoginUser(); | ||||