diff --git a/src/main/java/com/mzaxd/noodles/domain/entity/Container.java b/src/main/java/com/mzaxd/noodles/domain/entity/Container.java index 5ae29d1..43f0b31 100644 --- a/src/main/java/com/mzaxd/noodles/domain/entity/Container.java +++ b/src/main/java/com/mzaxd/noodles/domain/entity/Container.java @@ -52,6 +52,11 @@ public class Container implements Serializable { */ private String webUi; + /** + * 实际服务器地址(不带协议,不带端口号) + */ + private String serverAddress; + /** * 宿主机id */ diff --git a/src/main/java/com/mzaxd/noodles/domain/entity/HostMachine.java b/src/main/java/com/mzaxd/noodles/domain/entity/HostMachine.java index 035889d..edca780 100644 --- a/src/main/java/com/mzaxd/noodles/domain/entity/HostMachine.java +++ b/src/main/java/com/mzaxd/noodles/domain/entity/HostMachine.java @@ -57,6 +57,11 @@ public class HostMachine implements Serializable { */ private String manageIp; + /** + * 实际服务器地址(不带协议,不带端口号) + */ + private String serverAddress; + /** * 宿主机id(0代表物理机没有宿主机) */ diff --git a/src/main/java/com/mzaxd/noodles/domain/vo/ContainerVo.java b/src/main/java/com/mzaxd/noodles/domain/vo/ContainerVo.java index 142b01e..4dda494 100644 --- a/src/main/java/com/mzaxd/noodles/domain/vo/ContainerVo.java +++ b/src/main/java/com/mzaxd/noodles/domain/vo/ContainerVo.java @@ -39,6 +39,11 @@ public class ContainerVo { */ private String imageName; + /** + * 实际服务器地址(不带协议,不带端口号) + */ + private String serverAddress; + /** * WebUi URL */ diff --git a/src/main/java/com/mzaxd/noodles/domain/vo/HostVo.java b/src/main/java/com/mzaxd/noodles/domain/vo/HostVo.java index 21f50ad..47d0986 100644 --- a/src/main/java/com/mzaxd/noodles/domain/vo/HostVo.java +++ b/src/main/java/com/mzaxd/noodles/domain/vo/HostVo.java @@ -34,6 +34,11 @@ public class HostVo { */ private String avatar; + /** + * 实际服务器地址(不带协议,不带端口号) + */ + private String serverAddress; + /** * 管理ip地址 */ diff --git a/src/main/java/com/mzaxd/noodles/domain/vo/VirtualMachineListVo.java b/src/main/java/com/mzaxd/noodles/domain/vo/VirtualMachineListVo.java index c85b366..b635bc1 100644 --- a/src/main/java/com/mzaxd/noodles/domain/vo/VirtualMachineListVo.java +++ b/src/main/java/com/mzaxd/noodles/domain/vo/VirtualMachineListVo.java @@ -53,6 +53,11 @@ public class VirtualMachineListVo { */ private String manageIp; + /** + * 实际服务器地址(不带协议,不带端口号) + */ + private String serverAddress; + /** * 核心线程数 */ diff --git a/src/main/java/com/mzaxd/noodles/domain/vo/VmVo.java b/src/main/java/com/mzaxd/noodles/domain/vo/VmVo.java index c82ea5c..0fdd4c5 100644 --- a/src/main/java/com/mzaxd/noodles/domain/vo/VmVo.java +++ b/src/main/java/com/mzaxd/noodles/domain/vo/VmVo.java @@ -54,6 +54,11 @@ public class VmVo { */ private String osName; + /** + * 实际服务器地址(不带协议,不带端口号) + */ + private String serverAddress; + /** * 管理ip地址 */ diff --git a/src/main/resources/mapper/HostMachineMapper.xml b/src/main/resources/mapper/HostMachineMapper.xml index 9bb2f92..a742999 100644 --- a/src/main/resources/mapper/HostMachineMapper.xml +++ b/src/main/resources/mapper/HostMachineMapper.xml @@ -12,6 +12,7 @@ + @@ -29,7 +30,7 @@ . id ,hm.name,hm.description, - hm.avatar,hm.ssh_id,hm.os_id, + hm.avatar,hm.ssh_id,hm.os_id,hm.server_address, hm.manage_ip,hm.host_machine_id,hm.threads, hm.memory,hm.host_machine_state,notify, hm.create_time,hm.create_by,hm.update_time,