diff --git a/nex-be/Dockerfile b/nex-be/Dockerfile index 2f3b848..c7e4359 100644 --- a/nex-be/Dockerfile +++ b/nex-be/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /app COPY target/*.jar app.jar # 暴露应用端口 -EXPOSE 8112 +EXPOSE 8113 # 启动应用 ENTRYPOINT ["java", "-jar", "app.jar"] diff --git a/nex-be/docker-compose.yaml b/nex-be/docker-compose.yaml index d82aaa5..9dca2b3 100644 --- a/nex-be/docker-compose.yaml +++ b/nex-be/docker-compose.yaml @@ -1,12 +1,13 @@ services: app: build: . - image: nex-be:1.0.3 + image: nex-be:1.0.0 container_name: nex-be ports: - "8113:8113" + - "50051:50051" volumes: - /var/lib/vdi/:/var/lib/vdi/ environment: - SPRING_PROFILES_ACTIVE=prod - restart: always \ No newline at end of file + restart: always diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/req/NetworkManageReq.java b/nex-be/src/main/java/com/unisinsight/project/entity/req/NetworkManageReq.java index 2d8e60e..9b06942 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/req/NetworkManageReq.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/req/NetworkManageReq.java @@ -69,8 +69,8 @@ public class NetworkManageReq { /** * DHCP启用状态 */ - @ApiModelProperty(value = "DHCP启用状态") - @JsonProperty("dhcp_enabled:1 启用 0 不启用") + @ApiModelProperty(value = "DHCP启用状态:1 启用 0 不启用") + @JsonProperty("dhcp_enabled") private Short dhcpEnabled; /** @@ -100,8 +100,8 @@ public class NetworkManageReq { /** * 状态 */ - @ApiModelProperty(value = "状态,新增时不传") - @JsonProperty("status:1,活跃,0,非活跃") + @ApiModelProperty(value = "状态,新增时不传:1,活跃,0,非活跃") + @JsonProperty("status") private Integer status; /** diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java b/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java index 9296914..a12b159 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java @@ -31,6 +31,20 @@ public class StoragePoolReq { @JsonProperty("pool_name") private String poolName; + @ApiModelProperty("名称,用于传给虚拟机的时候用的") + @JsonProperty("storage_pool_name") + private String storagePoolName; + + + public String getStoragePoolName() { + return this.poolName; + } + + public void setPoolName(String poolName) { + this.poolName = poolName; + this.storagePoolName = poolName; // 同步值 + } + @ApiModelProperty("类型") @Size(max = 16, message = "类型长度不能超过16个字符") @JsonProperty("type") diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java index 939958e..7765a67 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java @@ -50,7 +50,7 @@ public class NetworkManageServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("name", networkManageReq.getNetworkName()); + queryWrapper.eq("network_name", networkManageReq.getNetworkName()); if (this.count(queryWrapper) > 0) { throw new BusinessException("网络名称'" + networkManageReq.getNetworkName() + "'已存在,请使用其他名称"); } diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java index ec0fdb4..a76b2f2 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java @@ -3,9 +3,10 @@ package com.unisinsight.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.unisinsight.project.entity.dao.NetworkManage; import com.unisinsight.project.entity.dao.StoragePool; -import com.unisinsight.project.entity.dto.*; +import com.unisinsight.project.entity.dto.ApiResponse; +import com.unisinsight.project.entity.dto.StoragePoolData; +import com.unisinsight.project.entity.dto.VmStoragePool; import com.unisinsight.project.entity.req.StoragePoolReq; import com.unisinsight.project.entity.res.PageResult; import com.unisinsight.project.exception.BusinessException; @@ -16,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; @@ -46,7 +46,7 @@ public class StoragePoolServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("name", storagePoolReq.getPoolName()); + queryWrapper.eq("pool_name", storagePoolReq.getPoolName()); if (this.count(queryWrapper) > 0) { throw new BusinessException("存储池名称'" + storagePoolReq.getPoolName() + "'已存在,请使用其他名称"); } @@ -265,7 +265,7 @@ public class StoragePoolServiceImpl extends ServiceImpl