调整模块结构

README.md

@@ -1,4 +1,5 @@
 # autodop
+autodop 是一个 DevOps 自动化系统。
 
 DevOps 自动化：
 - 构建部署
@@ -11,7 +12,9 @@ autodop 模块：
 - 第三方应用
 > 类似 MySQL 之类提供服务的程序
 - 主机
-> 物理主机和已部署 dagent 应用的主机(物理主机和虚拟主机)
+> 已部署 dagent 应用的主机(物理主机和虚拟主机)
+- 虚拟主机
+> 物理主机上的虚拟主机管理
 - 系统
 > autodop 系统管理
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/LocalDir.java

@@ -17,11 +17,23 @@ import javax.persistence.Entity;
 public class LocalDir extends BaseEntity {
     // 主机唯一标识
     private String hostId;
+    // 本地目录
+    private String localDir;
+    // 总容量
+    private String capacity;
+    // 可用容量
+    private String available;
+    // 已用容量
+    private String used;
+
     // 本地仓库
+    @Deprecated
     private String localRepo;
     // 编译目录
+    @Deprecated
     private String compileDir;
     // 打包目录
+    @Deprecated
     private String packDir;
 
     public LocalDir vo() {

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/global/LocalDirCrudService.java

@@ -29,9 +29,7 @@ public class LocalDirCrudService implements CrudOps<LocalDir> {
     @Override
     public void addOrModify(LocalDir localDir) throws Exception {
         // 检查并创建目录
-        checkOrMkdir(localDir.getLocalRepo());
-        checkOrMkdir(localDir.getCompileDir());
-        checkOrMkdir(localDir.getPackDir());
+        checkOrMkdir(localDir.getLocalDir());
 
         // 只做修改，不新增
         String hostId = localDir.getHostId();
@@ -57,6 +55,21 @@ public class LocalDirCrudService implements CrudOps<LocalDir> {
         if (!dir.exists() && !dir.mkdirs()) {
             throw new Exception(dirPath + " 不存在且创建失败...");
         }
+
+        dir = new File(dirPath + "/" + "localRepo");
+        if (!dir.mkdirs()) {
+            throw new Exception(dirPath + " 创建失败...");
+        }
+
+        dir = new File(dirPath + "/" + "compileDir");
+        if (!dir.mkdirs()) {
+            throw new Exception(dirPath + " 创建失败...");
+        }
+
+        dir = new File(dirPath + "/" + "packDir");
+        if (!dir.mkdirs()) {
+            throw new Exception(dirPath + " 创建失败...");
+        }
     }
 
     @Override

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/controller/GuestController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/controller/GuestController.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.host.vm.controller;
+package cn.reghao.autodop.dmaster.vm.controller;
 
 import cn.reghao.autodop.common.result.WebResult;
-import cn.reghao.autodop.dmaster.host.vm.kvm.Guest;
+import cn.reghao.autodop.dmaster.vm.kvm.Guest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/controller/HostController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/controller/HostController.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.host.vm.controller;
+package cn.reghao.autodop.dmaster.vm.controller;
 
 import cn.reghao.autodop.common.result.WebResult;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/controller/StorageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/controller/StorageController.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.host.vm.controller;
+package cn.reghao.autodop.dmaster.vm.controller;
 
 import cn.reghao.autodop.common.result.WebResult;
-import cn.reghao.autodop.dmaster.host.vm.kvm.Storage;
+import cn.reghao.autodop.dmaster.vm.kvm.Storage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/kvm/Guest.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/kvm/Guest.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.host.vm.kvm;
+package cn.reghao.autodop.dmaster.vm.kvm;
 
-import cn.reghao.autodop.dmaster.host.vm.pojo.GuestInfo;
+import cn.reghao.autodop.dmaster.vm.pojo.GuestInfo;
 import org.dom4j.Document;
 import org.dom4j.io.SAXReader;
 import org.libvirt.Connect;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/kvm/Network.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/kvm/Network.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.host.vm.kvm;
+package cn.reghao.autodop.dmaster.vm.kvm;
 
 import org.libvirt.Connect;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/kvm/Storage.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/kvm/Storage.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.host.vm.kvm;
+package cn.reghao.autodop.dmaster.vm.kvm;
 
-import cn.reghao.autodop.dmaster.host.vm.pojo.PoolInfo;
-import cn.reghao.autodop.dmaster.host.vm.pojo.VolumeInfo;
+import cn.reghao.autodop.dmaster.vm.pojo.PoolInfo;
+import cn.reghao.autodop.dmaster.vm.pojo.VolumeInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.dom4j.Document;
 import org.dom4j.io.SAXReader;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/pojo/GuestInfo.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/pojo/GuestInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.host.vm.pojo;
+package cn.reghao.autodop.dmaster.vm.pojo;
 
 import lombok.Data;
 import org.libvirt.Domain;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/pojo/PoolInfo.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/pojo/PoolInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.host.vm.pojo;
+package cn.reghao.autodop.dmaster.vm.pojo;
 
 import lombok.Data;
 import org.libvirt.LibvirtException;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/pojo/VolumeInfo.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/pojo/VolumeInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.host.vm.pojo;
+package cn.reghao.autodop.dmaster.vm.pojo;
 
 import lombok.Data;
 import org.libvirt.LibvirtException;

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/service/GuestService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/service/GuestService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.host.vm.service;
+package cn.reghao.autodop.dmaster.vm.service;
 
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/host/vm/service/StorageService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/service/StorageService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.host.vm.service;
+package cn.reghao.autodop.dmaster.vm.service;
 
 import org.springframework.stereotype.Service;