diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java index 2c2de8c..52a370f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java @@ -2,8 +2,10 @@ package com.ruoyi.platform.service.impl; import com.alibaba.fastjson2.util.DateUtils; import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.platform.domain.DevEnvironment; import com.ruoyi.platform.domain.Image; import com.ruoyi.platform.domain.ImageVersion; +import com.ruoyi.platform.mapper.DevEnvironmentDao; import com.ruoyi.platform.mapper.ImageDao; import com.ruoyi.platform.mapper.ImageVersionDao; import com.ruoyi.platform.service.ImageService; @@ -44,6 +46,8 @@ public class ImageServiceImpl implements ImageService { private ImageDao imageDao; @Resource private ImageVersionDao imageVersionDao; + @Resource + private DevEnvironmentDao devEnvironmentDao; @Resource private ImageVersionService imageVersionService; @@ -357,7 +361,6 @@ public class ImageServiceImpl implements ImageService { } @Override - @Async @Transactional public String saveImage(ImageVo imageVo) { if(imageDao.getByName(imageVo.getName()) != null){ @@ -365,7 +368,7 @@ public class ImageServiceImpl implements ImageService { } LoginUser loginUser = SecurityUtils.getLoginUser(); String username = loginUser.getUsername().toLowerCase(); - String podName = username +"-editor-pod" + "-" + imageVo.getDevEnvironmentId(); + String podName = username +"-editor-pod" + "-" + imageVo.getDevEnvironmentId().toString(); try { String containerId = k8sClientUtil.getPodContainerId(podName, namespace); @@ -397,6 +400,12 @@ public class ImageServiceImpl implements ImageService { imageVersion.setStatus("available"); imageVersionDao.insert(imageVersion); + //更新dev环境的镜像信息 + DevEnvironment devEnvironment = new DevEnvironment(); + devEnvironment.setId(imageVo.getDevEnvironmentId()); + devEnvironment.setImage(resultMap.get("imageName")); + devEnvironmentDao.update(devEnvironment); + return "保存镜像成功"; } catch (Exception e) { throw new RuntimeException("保存镜像失败:" +e); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java index 1153b57..4dabab2 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java @@ -65,7 +65,7 @@ public class ImageVo implements Serializable { @ApiModelProperty(value = "环境id") - private String devEnvironmentId; + private Integer devEnvironmentId; // public Integer getId() { // return id; // } @@ -154,11 +154,11 @@ public class ImageVo implements Serializable { this.path = path; } - public String getDevEnvironmentId() { + public Integer getDevEnvironmentId() { return devEnvironmentId; } - public void setDevEnvironmentId(String devEnvironmentId) { + public void setDevEnvironmentId(Integer devEnvironmentId) { this.devEnvironmentId = devEnvironmentId; }