ci4s
/
ci4sManagement-cloud
41
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

1、保存镜像，同时修改环境的镜像。

This commit is contained in:
chenzhihang 2024-08-28 08:51:58 +08:00
parent 88f4231459
commit a73b83c97d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
View File

@ -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);

6
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ImageVo.java
View File

@ -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;
}