tangqk
/
vdi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(image): 重构镜像服务相关代码 

- 移除 ImageConfigProperties 类，改为直接在 application.yml 中配置 URL
- 新增 ExternalApiClient 接口，用于调用外部 API
- 更新 ImageCreateReq、ImageUpdateReq等请求类的字段
- 修改 ImageVirtualMachines、ImageTool等实体类的字段类型- 重构 ImageVirtualMachinesServiceImpl 中的镜像操作方法
- 更新相关控制器和服务类以适应新的接口和数据结构
master
chenhao 2025-09-02 16:57:59 +08:00
parent 550fda7ce2
commit a421493709
16 changed files with 155 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nex-be/src/main/java/com/unisinsight/project/controller/ClientController.java
View File

@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil;
import com.unisinsight.project.entity.req.DeviceReq;
import com.unisinsight.project.entity.req.DeviceUserReq;
import com.unisinsight.project.entity.req.LoginReq;
import com.unisinsight.project.entity.res.ImageDesktopRes;
import com.unisinsight.project.exception.BaseErrorCode;
import com.unisinsight.project.exception.Result;
import com.unisinsight.project.service.ClientService;

8
nex-be/src/main/java/com/unisinsight/project/entity/dao/ImageDesktop.java
View File

@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 桌面镜像(ImageDesktop)表实体类
@ -87,7 +89,7 @@ public class ImageDesktop extends Model<ImageDesktop> {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
/**
* 创建人
**/
@ -103,7 +105,7 @@ public class ImageDesktop extends Model<ImageDesktop> {
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty("更新时间")
private String updateTime;
private Date updateTime;
/**
* 更新人
**/
@ -135,7 +137,7 @@ public class ImageDesktop extends Model<ImageDesktop> {
@TableField(value = "publish_time")
@ApiModelProperty("发布时间")
private String publishTime;
private Date publishTime;
}

10
nex-be/src/main/java/com/unisinsight/project/entity/dao/ImageTool.java
View File

@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* (ImageTool)表实体类
@ -63,7 +65,7 @@ public class ImageTool extends Model<ImageTool> {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
/**
* 创建人
**/
@ -79,7 +81,7 @@ public class ImageTool extends Model<ImageTool> {
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty("更新时间")
private String updateTime;
private Date updateTime;
/**
* 更新人
**/
@ -93,9 +95,9 @@ public class ImageTool extends Model<ImageTool> {
**/
@TableField(value = "upload_time")
@TableField(value = "upload_time", fill = FieldFill.INSERT)
@ApiModelProperty("上传时间")
private String uploadTime;
private Date uploadTime;
/**
* 存储路径
**/

21
nex-be/src/main/java/com/unisinsight/project/entity/dao/ImageVirtualMachines.java
View File

@ -3,10 +3,13 @@ package com.unisinsight.project.entity.dao;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 镜像虚拟机(ImageVirtualMachines)表实体类
@ -48,18 +51,32 @@ public class ImageVirtualMachines extends Model<ImageVirtualMachines> {
@TableField(value = "os_version")
@ApiModelProperty("操作系统")
private String osVersion;
@TableField("os_variant")
@ApiModelProperty("操作系统版本")
private String osVariant;
/**
* 镜像存储路径
**/
@TableField(value = "storage_path")
@ApiModelProperty("镜像存储路径")
private String storagePath;
@TableField("storage_pool_name")
@ApiModelProperty("存储卷名称")
private String storagePoolName;
/**
* 驱动名称
**/
@TableField("image_tool_name")
@ApiModelProperty("驱动名称")
private String imageToolName;
/**
* 创建时间
**/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
/**
* 创建人
**/
@ -71,7 +88,7 @@ public class ImageVirtualMachines extends Model<ImageVirtualMachines> {
**/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty("更新时间")
private String updateTime;
private Date updateTime;
/**
* 更新人
**/

5
nex-be/src/main/java/com/unisinsight/project/entity/req/ImageCreateReq.java
View File

@ -23,7 +23,7 @@ import lombok.NoArgsConstructor;
@Builder
public class ImageCreateReq {
@JsonProperty("name")
@JsonProperty("vm_name")
private String name;
@JsonProperty("os_type")
private String osType;
@ -35,8 +35,7 @@ public class ImageCreateReq {
private Integer memory;
@JsonProperty("disk_size")
private Integer diskSize;
@JsonProperty("disk_format")
private String diskFormat;
@JsonProperty("storage_pool_name")
private String storagePoolName;
@JsonProperty("network_name")

8
nex-be/src/main/java/com/unisinsight/project/entity/req/ImageToolReq.java
View File

@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* (ImageTool)表实体类
*
@ -50,7 +52,7 @@ public class ImageToolReq {
**/
@JsonProperty("create_time")
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
/**
* 创建人
**/
@ -62,7 +64,7 @@ public class ImageToolReq {
**/
@JsonProperty("update_time")
@ApiModelProperty("更新时间")
private String updateTime;
private Date updateTime;
/**
* 更新人
**/
@ -74,7 +76,7 @@ public class ImageToolReq {
**/
@JsonProperty("upload_time")
@ApiModelProperty("上传时间")
private String uploadTime;
private Date uploadTime;
/**
* 存储路径
**/

4
nex-be/src/main/java/com/unisinsight/project/entity/req/ImageUpdateReq.java
View File

@ -30,8 +30,12 @@ public class ImageUpdateReq {
private Integer vcpus;
@JsonProperty("memory")
private Integer memory;
@JsonProperty("disk_size")
private Integer diskSize;
@JsonProperty("network_name")
private String networkName;
@JsonProperty("STORAGE_POOL_NAME")
private String storagePoolName;
@JsonProperty("autostart")
private Boolean autostart;
@JsonProperty("auto_mount_virtio")

14
nex-be/src/main/java/com/unisinsight/project/entity/req/ImageVirtualMachinesReq.java
View File

@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 镜像虚拟机(ImageVirtualMachines)表实体类
*
@ -45,6 +47,12 @@ public class ImageVirtualMachinesReq {
@JsonProperty("os_version")
@ApiModelProperty("操作系统")
private String osVersion;
/**
* 操作系统版本
**/
@JsonProperty("os_variant")
@ApiModelProperty("操作系统版本")
private String osVariant;
/**
* 镜像存储路径
**/
@ -71,7 +79,7 @@ public class ImageVirtualMachinesReq {
**/
@JsonProperty("create_time")
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
/**
* 创建人
**/
@ -83,7 +91,7 @@ public class ImageVirtualMachinesReq {
**/
@JsonProperty("update_time")
@ApiModelProperty("更新时间")
private String updateTime;
private Date updateTime;
/**
* 更新人
**/
@ -118,7 +126,7 @@ public class ImageVirtualMachinesReq {
* 内存大小(GB)
**/
@JsonProperty("memory_total")
@ApiModelProperty("内存大小(GB)")
@ApiModelProperty("内存大小(MB)")
private Integer memoryTotal;
/**
* 系统盘大小(GB)

11
nex-be/src/main/java/com/unisinsight/project/entity/res/ImageStatusRes.java
View File

@ -24,16 +24,7 @@ import java.util.List;
@Data
public class ImageStatusRes {
@JsonProperty("code")
private String code;
@JsonProperty("message")
private String message;
@JsonProperty("data")
private DataDTO data;
@NoArgsConstructor
@Data
public static class DataDTO {
@JsonProperty("items")
private List<ItemsDTO> items;
@JsonProperty("total")
@ -124,5 +115,5 @@ public class ImageStatusRes {
private String network;
}
}
}
}

7
nex-be/src/main/java/com/unisinsight/project/entity/res/ImageToolRes.java
View File

@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* (ImageTool)表实体类
@ -52,7 +53,7 @@ public class ImageToolRes implements Serializable {
**/
@JsonProperty("create_time")
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
/**
* 创建人
**/
@ -64,7 +65,7 @@ public class ImageToolRes implements Serializable {
**/
@JsonProperty("update_time")
@ApiModelProperty("更新时间")
private String updateTime;
private Date updateTime;
/**
* 更新人
**/
@ -76,7 +77,7 @@ public class ImageToolRes implements Serializable {
**/
@JsonProperty("upload_time")
@ApiModelProperty("上传时间")
private String uploadTime;
private Date uploadTime;
/**
* 存储路径
**/

21
nex-be/src/main/java/com/unisinsight/project/entity/res/ImageVirtualMachinesRes.java
View File

@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 镜像虚拟机(ImageVirtualMachines)表实体类
@ -53,6 +54,9 @@ public class ImageVirtualMachinesRes implements Serializable {
@JsonProperty("os_version")
@ApiModelProperty("操作系统")
private String osVersion;
@JsonProperty("os_variant")
@ApiModelProperty("操作系统版本")
private String osVariant;
/**
* 镜像存储路径
**/
@ -64,7 +68,7 @@ public class ImageVirtualMachinesRes implements Serializable {
**/
@JsonProperty("create_time")
@ApiModelProperty("创建时间")
private String createTime;
private Date createTime;
/**
* 创建人
**/
@ -76,7 +80,7 @@ public class ImageVirtualMachinesRes implements Serializable {
**/
@JsonProperty("update_time")
@ApiModelProperty("更新时间")
private String updateTime;
private Date updateTime;
/**
* 更新人
**/
@ -125,9 +129,20 @@ public class ImageVirtualMachinesRes implements Serializable {
@JsonProperty("network_module")
@ApiModelProperty("网络模块")
private String networkModule;
@JsonProperty("storage_pool_name")
@ApiModelProperty("存储卷名称")
private String storagePoolName;
/**
* 驱动名称
**/
@JsonProperty("image_tool_name")
@ApiModelProperty("驱动名称")
private String imageToolName;
@JsonProperty("vnc_data")
@ApiModelProperty("远程连接信息")
private ImageStatusRes.DataDTO.ItemsDTO.VncDTO vncData;
private ImageStatusRes.ItemsDTO.VncDTO vncData;
}

35
nex-be/src/main/java/com/unisinsight/project/feign/ExternalApiClient.java
View File

@ -5,11 +5,14 @@ import com.unisinsight.project.entity.dto.ApiResponse;
import com.unisinsight.project.entity.dto.Network;
import com.unisinsight.project.entity.dto.NetworkData;
import com.unisinsight.project.entity.dto.StoragePoolData;
import com.unisinsight.project.entity.req.NetworkManageReq;
import com.unisinsight.project.entity.req.StoragePoolReq;
import com.unisinsight.project.entity.req.*;
import com.unisinsight.project.entity.res.ImageStatusRes;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* 第三方API客户端
*/
@ -52,4 +55,32 @@ public interface ExternalApiClient {
@GetMapping("/api/v1/storage/pools")
ApiResponse<StoragePoolData> listStorage(@RequestParam("page")int page, @RequestParam("page_size")int pageSize);
// 镜像虚拟机相关接口
@PostMapping("/api/v1/vm/batch-status")
ApiResponse<ImageStatusRes> getImageStatusData(@RequestBody Map<String, Object> requestBody);
@PostMapping("/api/v1/vm/create")
ApiResponse<ImageStatusRes> createImage(@RequestBody ImageCreateReq createReq);
@PostMapping("/api/v1/vm/update")
ApiResponse<ImageStatusRes> updateImage(@RequestBody ImageUpdateReq updateReq);
@PostMapping("/api/v1/vm/delete")
ApiResponse<ImageStatusRes> deleteImage(@RequestBody ImageDeleteReq deleteReq);
@PostMapping("/api/v1/vm/clone-to-desktop")
ApiResponse<ImageStatusRes> cloneTemplate(@RequestBody ImageCloneToDesktopReq cloneReq);
@PostMapping("/api/v1/vm/start")
ApiResponse<ImageStatusRes> startImage(@RequestBody ImageOperationReq operationReq);
@PostMapping("/api/v1/vm/shutdown")
ApiResponse<ImageStatusRes> shutdownImage(@RequestBody ImageOperationReq operationReq);
@PostMapping("/api/v1/vm/destroy")
ApiResponse<ImageStatusRes> destroyImage(@RequestBody ImageOperationReq operationReq);
@PostMapping("/api/v1/vm/reboot")
ApiResponse<ImageStatusRes> rebootImage(@RequestBody ImageOperationReq operationReq);
}

106
nex-be/src/main/java/com/unisinsight/project/properties/ImageConfigProperties.java
View File

@ -1,106 +0,0 @@
package com.unisinsight.project.properties;
import lombok.AccessLevel;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
* @author : ch
* @version : 1.0
* @ClassName : ImageConfigProperties
* @Description : 镜像服务配置属性类
* @DATE : Created in 15:52 2025/8/25
* <pre> Copyright: Copyright(c) 2025 </pre>
* <pre> Company : 紫光汇智信息技术有限公司 </pre>
* Modification History:
* Date Author Version Discription
* --------------------------------------------------------------------------
* 2025/08/25 ch 1.0 Why & What is modified: <修改原因描述> *
*/
@Component
@ConfigurationProperties(prefix = "image")
@Data
public class ImageConfigProperties {
/**
* 镜像服务基础URL
*/
private String baseUrl;
/**
* 状态查询URL
*/
@Getter(value=AccessLevel.NONE)
private String statusUrl;
@Getter(value=AccessLevel.NONE)
private String createUrl;
@Getter(value=AccessLevel.NONE)
private String deleteUrl;
@Getter(value=AccessLevel.NONE)
private String updateUrl;
@Getter(value=AccessLevel.NONE)
private String startUrl;
@Getter(value=AccessLevel.NONE)
private String shutdownUrl;
@Getter(value=AccessLevel.NONE)
private String destroyUrl;
@Getter(value=AccessLevel.NONE)
private String rebootUrl;
@Getter(value=AccessLevel.NONE)
private String pauseUrl;
@Getter(value=AccessLevel.NONE)
private String resumeUrl;
@Getter(value=AccessLevel.NONE)
private String cloneToDesktopUrl;
public String getStatusUrl() {
return baseUrl+statusUrl;
}
public String getCreateUrl() {
return baseUrl+createUrl;
}
public String getDeleteUrl() {
return baseUrl+deleteUrl;
}
public String getUpdateUrl() {
return baseUrl+updateUrl;
}
public String getStartUrl() {
return baseUrl+startUrl;
}
public String getShutdownUrl() {
return baseUrl+shutdownUrl;
}
public String getDestroyUrl() {
return baseUrl+destroyUrl;
}
public String getRebootUrl() {
return baseUrl+rebootUrl;
}
public String getPauseUrl() {
return baseUrl+pauseUrl;
}
public String getResumeUrl() {
return baseUrl+resumeUrl;
}
public String getCloneToDesktopUrl() {
return baseUrl+cloneToDesktopUrl;
}
}

3
nex-be/src/main/java/com/unisinsight/project/service/impl/ImageToolServiceImpl.java
View File

@ -147,10 +147,7 @@ public class ImageToolServiceImpl extends ServiceImpl<ImageToolMapper, ImageTool
imageTool.setFileVersion(fileVersion);
imageTool.setFileType(fileType);
imageTool.setStorePath(completion.getFilePath());
imageTool.setUploadTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
imageTool.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
imageTool.setCreateUser("admin");
imageTool.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
imageTool.setUpdateUser("admin");
if (description != null && !description.isEmpty()) {
imageTool.setDescription(description);

112
nex-be/src/main/java/com/unisinsight/project/service/impl/ImageVirtualMachinesServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.unisinsight.project.entity.dao.Image;
import com.unisinsight.project.entity.dao.ImageTool;
import com.unisinsight.project.entity.dao.ImageVirtualMachines;
import com.unisinsight.project.entity.dao.ImageDesktop;
import com.unisinsight.project.entity.dto.ApiResponse;
import com.unisinsight.project.entity.req.DeleteIdReq;
import com.unisinsight.project.entity.req.ImageCloneToDesktopReq;
import com.unisinsight.project.entity.req.ImageCreateReq;
@ -24,8 +25,9 @@ import com.unisinsight.project.entity.res.ImageVirtualMachinesRes;
import com.unisinsight.project.entity.res.PageResult;
import com.unisinsight.project.exception.BaseErrorCode;
import com.unisinsight.project.exception.Result;
import com.unisinsight.project.feign.ExternalApiClient;
import com.unisinsight.project.mapper.ImageVirtualMachinesMapper;
import com.unisinsight.project.properties.ImageConfigProperties;
import com.unisinsight.project.service.ImageDesktopService;
import com.unisinsight.project.service.ImageService;
import com.unisinsight.project.service.ImageToolService;
@ -35,9 +37,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.util.*;
@ -57,10 +57,8 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
private ImageVirtualMachinesMapper machinesMapper;
@Autowired
private ImageService imageService;
@Resource
private RestTemplate restTemplate;
@Autowired
private ImageConfigProperties imageConfigProperties;
@Autowired
private ExternalApiClient externalApiClient;
@Resource
private ImageToolService imageToolService;
@Autowired
@ -92,14 +90,14 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
//查询虚拟机数据
List<String> nameList = data.stream().map(ImageVirtualMachinesRes::getImageName).filter(Objects::nonNull).distinct().collect(Collectors.toList());
// 添加请求参数
Map<String, ImageStatusRes.DataDTO.ItemsDTO> imageStatusData = getImageStatusData(nameList);
Map<String, ImageStatusRes.ItemsDTO> imageStatusData = getImageStatusData(nameList);
for (ImageVirtualMachinesRes res : data) {
if (res.getImageSystemId() != null && StringUtils.isNotEmpty(imageMap.get(res.getImageSystemId()))) {
res.setImageSystemName(imageMap.get(res.getImageSystemId()));
}
if (imageStatusData.containsKey(res.getImageName())) {
ImageStatusRes.DataDTO.ItemsDTO itemsDTO = imageStatusData.get(res.getImageName());
ImageStatusRes.ItemsDTO itemsDTO = imageStatusData.get(res.getImageName());
res.setImageStatus(itemsDTO.getState());
res.setVncData(itemsDTO.getVnc());
}
@ -111,23 +109,20 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
}
}
private Map<String, ImageStatusRes.DataDTO.ItemsDTO> getImageStatusData(List<String> nameList) {
private Map<String, ImageStatusRes.ItemsDTO> getImageStatusData(List<String> nameList) {
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("page", 1);
requestBody.put("page_size", 100);
requestBody.put("vm_names", nameList);
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(imageConfigProperties.getStatusUrl(), HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (exchange.getBody() != null && "200".equals(exchange.getBody().getCode()) && exchange.getBody().getData() != null) {
List<ImageStatusRes.DataDTO.ItemsDTO> items = exchange.getBody().getData().getItems();
ApiResponse<ImageStatusRes> response = externalApiClient.getImageStatusData(requestBody);
if (response != null && "200".equals(response.getCode()) && response.getData() != null) {
List<ImageStatusRes.ItemsDTO> items = response.getData().getItems();
if (CollUtil.isNotEmpty(items)) {
return items.stream().collect(Collectors.toMap(ImageStatusRes.DataDTO.ItemsDTO::getName, Function.identity(), (k1, k2) -> k1));
return items.stream().collect(Collectors.toMap(ImageStatusRes.ItemsDTO::getName, Function.identity(), (k1, k2) -> k1));
}
}
log.error("根据名称[{}]请求接口,返回数据为空:{}", nameList, exchange.getBody());
log.error("根据名称[{}]请求接口,返回数据为空:{}", nameList, response);
return Collections.emptyMap();
}
@ -149,7 +144,7 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
Image systemImage = imageService.getOne(imageLambdaQueryWrapper);
//查询驱动信息
LambdaQueryWrapper<ImageTool> imageToolLambdaQueryWrapper = new LambdaQueryWrapper<>();
imageToolLambdaQueryWrapper.eq(ImageTool::getFileName, imageVirtualMachinesReq.getImageName());
imageToolLambdaQueryWrapper.eq(ImageTool::getFileName, imageVirtualMachinesReq.getImageToolName());
ImageTool imageTool = imageToolService.getOne(imageToolLambdaQueryWrapper);
@ -157,24 +152,24 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
ImageCreateReq createReq = ImageCreateReq.builder()
.name(imageVirtualMachinesReq.getImageName())
.osType(imageVirtualMachinesReq.getOsVersion())
.osVariant((systemImage!=null && StringUtils.isNotEmpty(systemImage.getImageVersion()))?systemImage.getImageVersion():"generic")
.osVariant(StringUtils.isNotEmpty(imageVirtualMachinesReq.getOsVariant()) ? imageVirtualMachinesReq.getOsVariant() : "generic")
.vcpus(imageVirtualMachinesReq.getCpuTotal())
.memory(imageVirtualMachinesReq.getMemoryTotal())
.diskSize(imageVirtualMachinesReq.getSystemTotal())
//存储池
.storagePoolName(imageVirtualMachinesReq.getStoragePoolName())
.networkName(imageVirtualMachinesReq.getNetworkModule())
.isoPath(imageVirtualMachinesReq.getStoragePath())
.isoPath(systemImage.getStoragePath())
.autoMountVirtio(false)
.autostart(false)
//驱动
.virtioWinPath(imageTool.getStorePath())
.description(imageVirtualMachinesReq.getDescription())
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageCreateReq> requestEntity = new HttpEntity<>(createReq, headers);
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(imageConfigProperties.getCreateUrl(), HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)){
ApiResponse<ImageStatusRes> response = externalApiClient.createImage(createReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "创建虚拟机失败");
}
@ -193,22 +188,24 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
@Override
public Result<?> update(ImageVirtualMachinesReq imageVirtualMachinesReq) {
// todo 调用镜像修改服务
//查询驱动信息
LambdaQueryWrapper<ImageTool> imageToolLambdaQueryWrapper = new LambdaQueryWrapper<>();
imageToolLambdaQueryWrapper.eq(ImageTool::getFileName, imageVirtualMachinesReq.getImageName());
ImageTool imageTool = imageToolService.getOne(imageToolLambdaQueryWrapper);
// 调用镜像修改服务
ImageUpdateReq updateReq = ImageUpdateReq.builder()
.vmName(imageVirtualMachinesReq.getImageName())
.vcpus(imageVirtualMachinesReq.getCpuTotal())
.memory(imageVirtualMachinesReq.getMemoryTotal())
.diskSize(imageVirtualMachinesReq.getSystemTotal())
.storagePoolName(imageVirtualMachinesReq.getStoragePoolName())
.networkName(imageVirtualMachinesReq.getNetworkModule())
//驱动
// .virtioWinPath(imageVirtualMachinesReq.getStoragePath())
.virtioWinPath(imageTool.getStorePath())
.description(imageVirtualMachinesReq.getDescription())
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageUpdateReq> requestEntity = new HttpEntity<>(updateReq, headers);
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(imageConfigProperties.getUpdateUrl(), HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)){
ApiResponse<ImageStatusRes> response = externalApiClient.updateImage(updateReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "修改虚拟机失败");
}
@ -251,11 +248,8 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
.vmName(imageVirtualMachines.getImageName())
.deleteStorage(true)
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageDeleteReq> requestEntity = new HttpEntity<>(deleteReq, headers);
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(imageConfigProperties.getDeleteUrl(), HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)) {
ApiResponse<ImageStatusRes> response = externalApiClient.deleteImage(deleteReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "删除虚拟机失败");
}
@ -271,6 +265,7 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
@Override
public Result<?> cloneTemplate(ImageVirtualMachinesReq req) {
// todo 改为调用脚本方式执行
// 查询虚拟机信息
ImageVirtualMachines imageVirtualMachines = machinesMapper.selectById(req.getId());
if (ObjectUtils.isEmpty(imageVirtualMachines)) {
@ -286,12 +281,8 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
.description("从虚拟机克隆的桌面镜像")
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageCloneToDesktopReq> requestEntity = new HttpEntity<>(cloneReq, headers);
String cloneToDesktopUrl = imageConfigProperties.getCloneToDesktopUrl();
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(cloneToDesktopUrl, HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)) {
ApiResponse<ImageStatusRes> response = externalApiClient.cloneTemplate(cloneReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "克隆虚拟机到桌面镜像失败");
}
@ -330,11 +321,8 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
ImageOperationReq operationReq = ImageOperationReq.builder()
.vmName(imageVirtualMachines.getImageName())
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageOperationReq> requestEntity = new HttpEntity<>(operationReq, headers);
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(imageConfigProperties.getStartUrl(), HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)) {
ApiResponse<ImageStatusRes> response = externalApiClient.startImage(operationReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "启动虚拟机失败");
}
@ -354,12 +342,8 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
ImageOperationReq operationReq = ImageOperationReq.builder()
.vmName(imageVirtualMachines.getImageName())
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageOperationReq> requestEntity = new HttpEntity<>(operationReq, headers);
String shutdownUrl = imageConfigProperties.getShutdownUrl();
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(shutdownUrl, HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)) {
ApiResponse<ImageStatusRes> response = externalApiClient.shutdownImage(operationReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "关闭虚拟机失败");
}
@ -379,12 +363,8 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
ImageOperationReq operationReq = ImageOperationReq.builder()
.vmName(imageVirtualMachines.getImageName())
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageOperationReq> requestEntity = new HttpEntity<>(operationReq, headers);
String destroyUrl = imageConfigProperties.getDestroyUrl();
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(destroyUrl, HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)) {
ApiResponse<ImageStatusRes> response = externalApiClient.destroyImage(operationReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "强制关闭虚拟机失败");
}
@ -404,12 +384,8 @@ public class ImageVirtualMachinesServiceImpl extends ServiceImpl<ImageVirtualMac
ImageOperationReq operationReq = ImageOperationReq.builder()
.vmName(imageVirtualMachines.getImageName())
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<ImageOperationReq> requestEntity = new HttpEntity<>(operationReq, headers);
String rebootUrl = imageConfigProperties.getRebootUrl();
ResponseEntity<ImageStatusRes> exchange = restTemplate.exchange(rebootUrl, HttpMethod.POST, requestEntity, ImageStatusRes.class);
if (!exchange.getStatusCode().equals(HttpStatus.OK)) {
ApiResponse<ImageStatusRes> response = externalApiClient.rebootImage(operationReq);
if (response == null || !"200".equals(response.getCode())) {
return Result.errorResult(BaseErrorCode.HTTP_REQUEST_FAILURE, "重启虚拟机失败");
}

15
nex-be/src/main/resources/application.yml
View File

@ -8,19 +8,6 @@ file:
bt-url: http://10.100.51.86:8114
tool:
dir: /vms/tool/iso
image:
base-url: http://10.100.51.178:5173
status-url: /api/v1/vm/batch-status
create-url: /api/v1/vm/create
delete-url: /api/v1/vm/delete
update-url: /api/v1/vm/update
start-url: /api/v1/vm/start
shutdown-url: /api/v1/vm/shutdown
destroy-url: /api/v1/vm/destroy
reboot-url: /api/v1/vm/reboot
pause-url: /api/v1/vm/pause
resume-url: /api/v1/vm/resume
clone-to-desktop-url: /api/v1/vm/clone-to-desktop
spring:
servlet:
multipart:
@ -63,7 +50,7 @@ mybatis-plus:
grpc:
server:
# 指定Grpc暴露的端口，后续客户端通过这个端口访问
port: 50051
port: 51051
# Feign 配置
feign: