优化代码结构，删除暂时未使用的 doc 和 vm 模块

common/src/main/java/cn/reghao/autodop/common/docker/Docker.java

@@ -133,6 +133,7 @@ public class Docker implements ImageOps, ContainerOps, AutoCloseable {
         try {
             FullHttpResponse response = client.post(uri, headers);
             checkResponse(response);
+            // TODO push 完成后查找镜像是否存在
         } catch (IOException | InterruptedException e) {
             throw new DockerException(ExceptionUtil.errorMsg(e));
         }
@@ -419,4 +420,13 @@ public class Docker implements ImageOps, ContainerOps, AutoCloseable {
 
         }
     }
+
+    public static void main(String[] args) {
+        String repoTag = "docker.alpha.iquizoo.com/iq3x/content:93902a0f";
+        try (Docker docker = new Docker()) {
+            docker.push(repoTag);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

common/src/main/java/cn/reghao/autodop/common/docker/api/DockerApi.java

@@ -16,6 +16,7 @@ public class DockerApi {
     public static final String pushPost = version + "/images/{}/push";
     public static final String pullPost = version + "/images/create";
     public static final String inspectImageGet = version + "/images/{}/json";
+    public static final String searchImageGet = version + "/images/json";
     public static final String rmImageDelete = version + "/images/{}";
 
     // container

common/src/main/java/cn/reghao/autodop/common/http/HttpApi.java

@@ -1,16 +0,0 @@
-package cn.reghao.autodop.common.http;
-
-/**
- * @author reghao
- * @date 2020-05-12 11:43:02
- */
-public class HttpApi {
-    public static String url(String address, int port, String api) {
-        String prefix = "http://";
-        if (port != 80) {
-            return prefix + address + ":" + port + api;
-        } else {
-            return prefix + address + api;
-        }
-    }
-}

common/src/main/java/cn/reghao/autodop/common/log/MqttAppender.java

@@ -16,10 +16,10 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
  * @date 2021-06-08 19:37:21
  */
 public class MqttAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
-    private String machineId;
-    private String machineIpv4;
-    private String appId;
-    private DefaultMqttClient mqttClient;
+    private final String machineId;
+    private final String machineIpv4;
+    private final String appId;
+    private final DefaultMqttClient mqttClient;
 
     public MqttAppender(String machineId, String machineIpv4, String appId, DefaultMqttClient mqttClient) {
         this.machineId = machineId;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/view/AppPageController.java

@@ -16,7 +16,7 @@ import cn.reghao.autodop.dmaster.app.entity.log.BuildTime;
 import cn.reghao.autodop.dmaster.app.repository.log.BuildLogRepository;
 import cn.reghao.autodop.dmaster.app.vo.BuildConfig;
 import cn.reghao.autodop.dmaster.auth.UserContext;
-import cn.reghao.autodop.dmaster.auth.entity.RoleType;
+import cn.reghao.autodop.dmaster.auth.model.RoleType;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/tools/packer/DockerPack.java

@@ -29,7 +29,6 @@ public class DockerPack implements CodePacker {
             docker.build(image, appCompileHome, dockerfile);
             // TODO push 没有报错，但有时 pull 会提示 image 不存在
             docker.push(image);
-            log.info("{} 已 push 到仓库...", image);
             return image;
         }
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/UserContext.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth;
 
 
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 
 /**
  * 获取当前请求的用户

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/LoginRedirectFilter.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.config;
 
 import cn.reghao.autodop.dmaster.auth.UserContext;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/UserDetailsServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.config;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.repository.UserRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/UsernamePasswordAuthProvider.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.auth.config;
 
 import cn.reghao.autodop.common.utils.security.Cryptor;
 import cn.reghao.autodop.common.utils.security.Md5Cryptor;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/WebAuthSuccessHandlerImpl.java

@@ -18,28 +18,36 @@ import java.io.PrintWriter;
  */
 public class WebAuthSuccessHandlerImpl implements AuthenticationSuccessHandler {
     @Override
-    public void onAuthenticationSuccess(HttpServletRequest request,
-                                        HttpServletResponse response,
-                                        Authentication authentication) throws IOException {
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication auth)
+            throws IOException {
         sendResponse(response);
+        //redirect(request, response);
     }
 
+    private void sendResponse(HttpServletResponse response) throws IOException {
+        response.setContentType("text/html;charset=utf-8");
+        String result = WebBody.success("");
+        PrintWriter pt = response.getWriter();
+        pt.println(result);
+    }
+
+    /**
+     * TODO 前端无法处理重定向
+     *
+     * @param
+     * @return
+     * @date 2021-07-27 下午3:54
+     */
     private void redirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
         SavedRequest savedRequest =
                 (SavedRequest) request.getSession().getAttribute("SPRING_SECURITY_SAVED_REQUEST");
         if (savedRequest != null) {
             String redirectUrl = savedRequest.getRedirectUrl();
-            // 跳转到登录前的 URL
+            // 跳转到登录前的地址
             response.sendRedirect(redirectUrl);
         } else {
+            // 跳转到首页
             response.sendRedirect("/");
         }
     }
-
-    private void sendResponse(HttpServletResponse response) throws IOException {
-        response.setContentType("text/html;charset=utf-8");
-        String result = WebBody.success("");
-        PrintWriter pt = response.getWriter();
-        pt.println(result);
-    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/ResourceController.java

@@ -3,9 +3,8 @@ package cn.reghao.autodop.dmaster.auth.controller;
 import cn.reghao.autodop.common.result.Result;
 import cn.reghao.autodop.common.result.ResultStatus;
 import cn.reghao.autodop.dmaster.auth.db.query.MenuQuery;
-import cn.reghao.autodop.dmaster.auth.entity.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.vo.MenuVO;
+import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 import cn.reghao.autodop.dmaster.utils.WebBody;
 import cn.reghao.autodop.dmaster.auth.service.MenuServiceImpl;
 import io.swagger.annotations.Api;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/ResourcePageController.java

@@ -2,10 +2,9 @@ package cn.reghao.autodop.dmaster.auth.controller;
 
 import cn.reghao.autodop.dmaster.auth.db.query.MenuQuery;
 import cn.reghao.autodop.dmaster.auth.db.query.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.entity.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.vo.MenuVO;
+import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/RoleController.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.auth.controller;
 
 import cn.reghao.autodop.dmaster.auth.db.query.MenuQuery;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import cn.reghao.autodop.dmaster.auth.service.RoleService;
 import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/RolePageController.java

@@ -1,9 +1,8 @@
 package cn.reghao.autodop.dmaster.auth.controller;
 
 import cn.reghao.autodop.dmaster.auth.db.query.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.entity.vo.RoleVO;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.model.vo.RoleVO;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/UserController.java

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.auth.controller;
 
-import cn.reghao.autodop.dmaster.auth.entity.*;
-import cn.reghao.autodop.dmaster.auth.entity.po.GrantedAuthorityImpl;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.*;
+import cn.reghao.autodop.dmaster.auth.model.po.GrantedAuthorityImpl;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 import cn.reghao.autodop.dmaster.auth.service.UserService;
 import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/UserPageController.java

@@ -2,9 +2,9 @@ package cn.reghao.autodop.dmaster.auth.controller;
 
 import cn.reghao.autodop.dmaster.auth.db.query.RoleQuery;
 import cn.reghao.autodop.dmaster.auth.db.query.UserQuery;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.entity.vo.UserVO;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.model.vo.UserVO;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/RoleCrud.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.db;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/query/MenuQuery.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.db.query;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/query/RoleQuery.java

@@ -1,11 +1,11 @@
 package cn.reghao.autodop.dmaster.auth.db.query;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.GrantedAuthorityImpl;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.entity.vo.RoleVO;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
-import cn.reghao.autodop.dmaster.auth.repository.UserRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.GrantedAuthorityImpl;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.model.vo.RoleVO;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/query/UserQuery.java

@@ -1,11 +1,11 @@
 package cn.reghao.autodop.dmaster.auth.db.query;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.GrantedAuthorityImpl;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.entity.vo.UserVO;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
-import cn.reghao.autodop.dmaster.auth.repository.UserRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.GrantedAuthorityImpl;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.model.vo.UserVO;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/repository/MenuRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/repository/MenuRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.repository;
+package cn.reghao.autodop.dmaster.auth.db.repository;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/repository/RoleRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/repository/RoleRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.repository;
+package cn.reghao.autodop.dmaster.auth.db.repository;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/repository/UserRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.repository;
+package cn.reghao.autodop.dmaster.auth.db.repository;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/DataStatus.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/DataStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity;
+package cn.reghao.autodop.dmaster.auth.model;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/MenuType.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/MenuType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity;
+package cn.reghao.autodop.dmaster.auth.model;
 
 /**
  * 菜单类型

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/RoleType.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/RoleType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity;
+package cn.reghao.autodop.dmaster.auth.model;
 
 /**
  * 角色类型

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/UserGender.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/UserGender.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity;
+package cn.reghao.autodop.dmaster.auth.model;
 
 import java.util.HashMap;
 import java.util.Map;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/UserInfo.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/UserInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity;
+package cn.reghao.autodop.dmaster.auth.model;
 
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/UserRole.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/UserRole.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.entity;
+package cn.reghao.autodop.dmaster.auth.model;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/dto/MenuDTO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/dto/MenuDTO.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.entity.dto;
+package cn.reghao.autodop.dmaster.auth.model.dto;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/po/GrantedAuthorityImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/GrantedAuthorityImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity.po;
+package cn.reghao.autodop.dmaster.auth.model.po;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/po/Menu.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/Menu.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity.po;
+package cn.reghao.autodop.dmaster.auth.model.po;
 
 import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/po/Role.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/Role.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity.po;
+package cn.reghao.autodop.dmaster.auth.model.po;
 
 import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/po/User.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/User.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.entity.po;
+package cn.reghao.autodop.dmaster.auth.model.po;
 
 import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/vo/MenuVO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/MenuVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.entity.vo;
+package cn.reghao.autodop.dmaster.auth.model.vo;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 import lombok.Data;
 
 import java.io.Serializable;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/vo/RoleVO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/RoleVO.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.entity.vo;
+package cn.reghao.autodop.dmaster.auth.model.vo;
 
 import cn.reghao.autodop.common.utils.DateTimeConverter;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import lombok.Data;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/entity/vo/UserVO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/UserVO.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.dmaster.auth.entity.vo;
+package cn.reghao.autodop.dmaster.auth.model.vo;
 
 import cn.reghao.autodop.common.utils.DateTimeConverter;
-import cn.reghao.autodop.dmaster.auth.entity.UserGender;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.UserGender;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 import lombok.Data;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/MenuService.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
 import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.dmaster.auth.entity.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/MenuServiceImpl.java

@@ -3,12 +3,12 @@ package cn.reghao.autodop.dmaster.auth.service;
 import cn.reghao.autodop.common.result.Result;
 import cn.reghao.autodop.common.result.ResultStatus;
 import cn.reghao.autodop.dmaster.auth.db.query.MenuQuery;
-import cn.reghao.autodop.dmaster.auth.entity.MenuType;
-import cn.reghao.autodop.dmaster.auth.entity.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.repository.MenuRepository;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.model.MenuType;
+import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/RoleService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
 
 import java.util.Set;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/RoleServiceImpl.java

@@ -1,10 +1,10 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
 import cn.reghao.autodop.dmaster.auth.db.query.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/UserService.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.entity.UserInfo;
-import cn.reghao.autodop.dmaster.auth.entity.UserRole;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.model.UserInfo;
+import cn.reghao.autodop.dmaster.auth.model.UserRole;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/UserServiceImpl.java

@@ -3,10 +3,10 @@ package cn.reghao.autodop.dmaster.auth.service;
 import cn.reghao.autodop.common.utils.security.Cryptor;
 import cn.reghao.autodop.common.utils.security.Md5Cryptor;
 import cn.reghao.autodop.common.utils.security.Salt;
-import cn.reghao.autodop.dmaster.auth.entity.*;
-import cn.reghao.autodop.dmaster.auth.entity.po.GrantedAuthorityImpl;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.repository.UserRepository;
+import cn.reghao.autodop.dmaster.auth.model.*;
+import cn.reghao.autodop.dmaster.auth.model.po.GrantedAuthorityImpl;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/common/orm/BaseEntity.java

@@ -23,7 +23,6 @@ public class BaseEntity<T extends Serializable> implements Serializable {
     protected T id;
     // 逻辑删除
     private Boolean isDelete;
-
     @CreationTimestamp
     @Column(updatable = false)
     protected LocalDateTime createTime;

dmaster/src/main/java/cn/reghao/autodop/dmaster/doc/controller/DocController.java

@@ -1,15 +0,0 @@
-package cn.reghao.autodop.dmaster.doc.controller;
-
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author reghao
- * @date 2021-07-15 19:43:49
- */
-@Api(tags = "文档接口")
-@RequestMapping("/api/doc")
-@RestController
-public class DocController {
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/doc/controller/DocPageController.java

@@ -1,15 +0,0 @@
-package cn.reghao.autodop.dmaster.doc.controller;
-
-import io.swagger.annotations.Api;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author reghao
- * @date 2021-07-15 19:43:49
- */
-@Api(tags = "文档页面")
-@RequestMapping("/doc")
-@Controller
-public class DocPageController {
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/doc/entity/AppAccount.java

@@ -1,14 +0,0 @@
-package cn.reghao.autodop.dmaster.doc.entity;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2021-07-15 19:50:25
- */
-@Data
-public class AppAccount {
-    private String httpAddr;
-    private String username;
-    private String password;
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/doc/service/DocService.java

@@ -1,11 +0,0 @@
-package cn.reghao.autodop.dmaster.doc.service;
-
-import org.springframework.stereotype.Service;
-
-/**
- * @author reghao
- * @date 2021-07-15 19:49:13
- */
-@Service
-public class DocService {
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/ssh/WebSshImpl.java

@@ -30,8 +30,8 @@ import java.util.concurrent.ExecutorService;
 @Slf4j
 @Service
 public class WebSshImpl implements WebSsh {
-    private static Map<String, SshConnInfo> sshConnMap = new ConcurrentHashMap<>();
-    private ExecutorService threadPool = ThreadPoolWrapper.threadPool("webssh-service");
+    private static final Map<String, SshConnInfo> sshConnMap = new ConcurrentHashMap<>();
+    private final ExecutorService threadPool = ThreadPoolWrapper.threadPool("webssh-service");
 
     @Override
     public void init(WebSocketSession session) {

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/controller/SysController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.sys.controller;
 
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
 import cn.reghao.autodop.dmaster.sys.service.BakService;
 import cn.reghao.autodop.dmaster.sys.service.SysConfig;
 import cn.reghao.autodop.dmaster.utils.UploadDownload;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/controller/SysPageController.java

@@ -4,8 +4,8 @@ import cn.reghao.autodop.common.jvm.JVM;
 import cn.reghao.autodop.common.jvm.pojo.JvmInfo;
 import cn.reghao.autodop.common.jvm.pojo.JvmStat;
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
 import cn.reghao.autodop.dmaster.sys.service.BakService;
 import cn.reghao.autodop.dmaster.sys.service.SysConfig;
 import cn.reghao.autodop.dmaster.utils.UploadDownload;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/controller/TestController.java

@@ -1,17 +1,17 @@
 package cn.reghao.autodop.dmaster.sys.controller;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.GrantedAuthorityImpl;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.po.GrantedAuthorityImpl;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 import cn.reghao.autodop.dmaster.utils.WebBody;
 import cn.reghao.autodop.common.utils.security.Cryptor;
 import cn.reghao.autodop.common.utils.security.Md5Cryptor;
 import cn.reghao.autodop.common.utils.security.Salt;
-import cn.reghao.autodop.dmaster.auth.entity.*;
-import cn.reghao.autodop.dmaster.auth.repository.MenuRepository;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
-import cn.reghao.autodop.dmaster.auth.repository.UserRepository;
+import cn.reghao.autodop.dmaster.auth.model.*;
+import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/service/BakService.java

@@ -1,12 +1,12 @@
 package cn.reghao.autodop.dmaster.sys.service;
 
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.repository.MenuRepository;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
-import cn.reghao.autodop.dmaster.auth.repository.UserRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/service/SysConfig.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.sys.service;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/SshUtil.java

@@ -1,26 +0,0 @@
-package cn.reghao.autodop.dmaster.utils;
-
-import com.jcraft.jsch.*;
-
-/**
- * @author reghao
- * @date 2020-03-10 22:59:42
- */
-public class SshUtil {
-    public static void exec() throws JSchException {
-        String host = "192.168.0.171";
-        int port = 22;
-        String username = "root";
-        String password = "guanjingsong";
-
-        JSch jsch = new JSch();
-        Session session = jsch.getSession(username, host, port);
-        session.setPassword(password);
-        session.connect();
-
-        String command = "ls -l /";
-        ChannelExec exec = (ChannelExec) session.openChannel("exec");
-        exec.setCommand(command);
-        exec.setInputStream(null);
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/controller/HomePageController.java

@@ -1,11 +1,11 @@
 package cn.reghao.autodop.dmaster.view.controller;
 
 import cn.reghao.autodop.dmaster.auth.UserContext;
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.entity.po.Role;
-import cn.reghao.autodop.dmaster.auth.entity.po.User;
-import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
-import cn.reghao.autodop.dmaster.auth.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
 import io.swagger.annotations.Api;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/service/HomeService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.view.service;
 
-import cn.reghao.autodop.dmaster.auth.entity.po.Menu;
-import cn.reghao.autodop.dmaster.auth.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/attribute/SelectDictAttrProcessor.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.view.thymeleaf.attribute;
 
 import cn.reghao.autodop.dmaster.app.constant.EnvList;
-import cn.reghao.autodop.dmaster.auth.entity.MenuType;
+import cn.reghao.autodop.dmaster.auth.model.MenuType;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.context.ITemplateContext;
 import org.thymeleaf.engine.AttributeName;

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

@@ -1,56 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.controller;
-
-import cn.reghao.autodop.dmaster.utils.WebBody;
-import cn.reghao.autodop.dmaster.vm.service.kvm.Guest;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author reghao
- * @date 2020-10-31 16:04:58
- */
-@RestController
-@RequestMapping("/api/vm/guest")
-public class GuestController {
-    private String uri = "qemu:///system";
-    private Guest guest = new Guest(uri);
-
-    @ApiOperation(value = "")
-    @PostMapping
-    public String addGuest(@RequestBody String data) throws Exception {
-        guest.createDomain();
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @GetMapping
-    public String getGuest() throws Exception {
-        return WebBody.success(guest.listDomain());
-    }
-
-    @ApiOperation(value = "")
-    @DeleteMapping
-    public String deleteGuest(@PathVariable("guestName") String guestName) throws Exception {
-        guest.deleteDomain(guestName);
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @PostMapping("/start")
-    public String start(@RequestParam("guestName") String guestName) throws Exception {
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @PostMapping("/stop")
-    public String stop(@RequestParam("guestName") String guestName) throws Exception {
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @PostMapping("/restart")
-    public String restart(@RequestParam("guestName") String guestName) throws Exception {
-        return WebBody.success();
-    }
-}

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

@@ -1,37 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.controller;
-
-import cn.reghao.autodop.dmaster.utils.WebBody;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author reghao
- * @date 2020-10-31 16:04:58
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/vm/host")
-public class HostController {
-    @PostMapping
-    public String addPhysicalHost(@RequestParam("name") String name) {
-    //public String addPhysicalHost(@RequestParam("name") String name, @RequestBody String json) {
-        log.info("post request...");
-        return WebBody.success();
-    }
-
-    @DeleteMapping
-    public String deletePhysicalHost() {
-        //public String addPhysicalHost(@RequestParam("name") String name, @RequestBody String json) {
-        log.info("delete request...");
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @GetMapping("/list")
-    public String nodeList(@RequestParam("name") String name) {
-        log.info("name -> {}", name);
-        return WebBody.success();
-    }
-}

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

@@ -1,58 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.controller;
-
-import cn.reghao.autodop.dmaster.utils.WebBody;
-import cn.reghao.autodop.dmaster.vm.service.kvm.Storage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author reghao
- * @date 2020-10-31 16:04:58
- */
-@RestController
-@RequestMapping("/api/vm/storage")
-public class StorageController {
-    private String uri = "qemu:///system";
-    private Storage storage = new Storage(uri);
-
-    @ApiOperation(value = "")
-    @PostMapping("/pool")
-    public String addPool(@RequestBody String data) throws Exception {
-        storage.createStoragePool();
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @GetMapping("/pool")
-    public String getPool() throws Exception {
-        return WebBody.success(storage.listStoragePool());
-    }
-
-    @ApiOperation(value = "")
-    @DeleteMapping("/pool/{poolName}")
-    public String deletePool(@PathVariable("poolName") String poolName) throws Exception {
-        storage.deleteStoragePool(poolName);
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @PostMapping("/volume")
-    public String addVolume(String poolName, int capacity) throws Exception {
-        storage.createStorageVolume(poolName, capacity);
-        return WebBody.success();
-    }
-
-    @ApiOperation(value = "")
-    @GetMapping("/volume/{poolName}")
-    public String getVolume(@PathVariable("poolName") String poolName) throws Exception {
-        return WebBody.success(storage.listStorageVolume(poolName));
-    }
-
-    @ApiOperation(value = "")
-    @DeleteMapping("/volume")
-    public String deleteVolume(String volKey) throws Exception {
-        storage.deleteStorageVolume(volKey);
-        return WebBody.success();
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/entity/GuestInfo.java

@@ -1,44 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.entity;
-
-import lombok.Data;
-import org.libvirt.Domain;
-import org.libvirt.DomainInfo;
-import org.libvirt.LibvirtException;
-
-/**
- * @author reghao
- * @date 2020-11-01 01:43:57
- */
-@Data
-public class GuestInfo {
-    private String name;
-    private int id;
-    private String uuid;
-    private String osType;
-    private String isActive;
-    private String isAutoStart;
-    private String xmlDesc;
-    private String state;
-    private int vcpu;
-    private long vcpuTime;
-    private long vmem;
-    private long maxVmem;
-
-
-    public GuestInfo(Domain domain) throws LibvirtException {
-        this.name = domain.getName();
-        this.id = domain.getID();
-        this.uuid = domain.getUUIDString();
-        this.osType = domain.getOSType();
-        this.isActive = domain.isActive() == 1 ? "YES" : "NO";
-        this.isAutoStart = domain.getAutostart() ? "YES" : "NO";
-        this.xmlDesc = domain.getXMLDesc(0);
-
-        DomainInfo domainInfo = domain.getInfo();
-        this.state = domainInfo.state.name();
-        this.vcpu = domainInfo.nrVirtCpu;
-        this.vcpuTime = domainInfo.cpuTime;
-        this.vmem = domainInfo.memory;
-        this.maxVmem = domainInfo.maxMem;
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/entity/PoolInfo.java

@@ -1,39 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.entity;
-
-import lombok.Data;
-import org.libvirt.LibvirtException;
-import org.libvirt.StoragePool;
-import org.libvirt.StoragePoolInfo;
-
-/**
- * @author reghao
- * @date 2020-10-31 19:08:19
- */
-@Data
-public class PoolInfo {
-    private String name;
-    private String uuid;
-    private String state;
-    private long capacity;
-    private long allocation;
-    private long available;
-    private String isPersistent;
-    private String isActive;
-    private String isAutoStart;
-    private String xmlDesc;
-
-    public PoolInfo(StoragePool storagePool) throws LibvirtException {
-        this.name = storagePool.getName();
-        this.uuid = storagePool.getUUIDString();
-        this.isPersistent = storagePool.isPersistent() == 1 ? "YES" : "NO";
-        this.isActive = storagePool.isActive() == 1 ? "YES" : "NO";
-        this.isAutoStart = storagePool.getAutostart() ? "YES" : "NO";
-        this.xmlDesc = storagePool.getXMLDesc(0);
-
-        StoragePoolInfo storagePoolInfo = storagePool.getInfo();
-        this.state = storagePoolInfo.state.name();
-        this.capacity = storagePoolInfo.capacity;
-        this.allocation = storagePoolInfo.allocation;
-        this.available = storagePoolInfo.available;
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/entity/VolumeInfo.java

@@ -1,34 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.entity;
-
-import lombok.Data;
-import org.libvirt.LibvirtException;
-import org.libvirt.StorageVol;
-import org.libvirt.StorageVolInfo;
-
-/**
- * @author reghao
- * @date 2020-10-31 19:08:26
- */
-@Data
-public class VolumeInfo {
-    private String name;
-    private String key;
-    private String type;
-    private long capacity;
-    private long allocation;
-    private String path;
-    private String xmlDesc;
-
-    public VolumeInfo(StorageVol storageVol) throws LibvirtException {
-        this.name = storageVol.getName();
-        this.key = storageVol.getKey();
-
-        StorageVolInfo storageVolInfo = storageVol.getInfo();
-        this.type = storageVolInfo.type.name();
-        this.capacity = storageVolInfo.capacity;
-        this.allocation = storageVolInfo.allocation;
-
-        this.path = storageVol.getPath();
-        this.xmlDesc = storageVol.getXMLDesc(0);
-    }
-}

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

@@ -1,11 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.service;
-
-import org.springframework.stereotype.Service;
-
-/**
- * @author reghao
- * @date 2020-10-31 16:04:58
- */
-@Service
-public class GuestService {
-}

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

@@ -1,11 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.service;
-
-import org.springframework.stereotype.Service;
-
-/**
- * @author reghao
- * @date 2020-10-31 16:04:58
- */
-@Service
-public class StorageService {
-}

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

@@ -1,77 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.service.kvm;
-
-import cn.reghao.autodop.dmaster.vm.entity.GuestInfo;
-import org.dom4j.Document;
-import org.dom4j.io.SAXReader;
-import org.libvirt.Connect;
-import org.libvirt.Domain;
-import org.libvirt.LibvirtException;
-
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 虚拟主机
- *
- * @author reghao
- * @date 2020-10-28 18:48:52
- */
-public class Guest {
-    private String uri;
-
-    public Guest(String uri) {
-        this.uri = uri;
-    }
-
-    public void createDomain() throws Exception {
-        Connect conn = new Connect(uri, false);
-        String xml = "/home/reghao/docs/zzz/backend/kvm/xml/vhost.xml";
-        Document doc = new SAXReader().read(new FileInputStream(xml));
-        Domain domain = conn.domainDefineXML(doc.asXML());
-    }
-
-    public List<GuestInfo> listDomain() throws Exception {
-        Connect conn = new Connect(uri, false);
-        List<GuestInfo> list = new ArrayList<>();
-        String[] domainNames = conn.listDefinedDomains();
-        for (String domainName : domainNames) {
-            list.add(new GuestInfo(conn.domainLookupByName(domainName)));
-        }
-
-        int[] active = conn.listDomains();
-        for (int id : active) {
-            list.add(new GuestInfo(conn.domainLookupByID(id)));
-        }
-        return list;
-    }
-
-    public void deleteDomain(String guestName) throws LibvirtException {
-        Connect conn = new Connect(uri, false);
-        Domain domain = conn.domainLookupByName(guestName);
-
-        domain.undefine();
-        domain.free();
-        /*String xmlDesc = domain.getXMLDesc(0);
-        domain.detachDevice(xmlDesc);
-        domain.destroy();*/
-    }
-
-    public void start(String guestName) throws Exception {
-        Connect conn = new Connect(uri, false);
-        Domain domain = conn.domainLookupByName(guestName);
-        domain.create();
-    }
-
-    public void stop(String guestName) throws Exception {
-        Connect conn = new Connect(uri, false);
-        Domain domain = conn.domainLookupByName(guestName);
-        domain.shutdown();
-    }
-
-    public void restart(String guestName) throws Exception {
-        Connect conn = new Connect(uri, false);
-        Domain domain = conn.domainLookupByName(guestName);
-        domain.reboot(0);
-    }
-}

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

@@ -1,23 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.service.kvm;
-
-import org.libvirt.Connect;
-
-/**
- * @author reghao
- * @date 2020-10-29 14:29:40
- */
-public class Network {
-    private String uri;
-
-    public Network(String uri) {
-        this.uri = uri;
-    }
-
-    public void listNetwork() throws Exception {
-        Connect conn = new Connect(uri, false);
-        String[] networks = conn.listNetworks();
-        String[] networkFilters = conn.listNetworkFilters();
-        String[] definedNetworks = conn.listDefinedNetworks();
-        System.out.println();
-    }
-}

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

@@ -1,99 +0,0 @@
-package cn.reghao.autodop.dmaster.vm.service.kvm;
-
-import cn.reghao.autodop.dmaster.vm.entity.PoolInfo;
-import cn.reghao.autodop.dmaster.vm.entity.VolumeInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.dom4j.Document;
-import org.dom4j.io.SAXReader;
-import org.libvirt.*;
-
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 存储
- *
- * @author reghao
- * @date 2020-10-28 21:44:01
- */
-@Slf4j
-public class Storage {
-    private String uri;
-
-    public Storage(String uri) {
-        this.uri = uri;
-    }
-
-    public void createStoragePool() throws Exception {
-        Connect conn = new Connect(uri, false);
-        String xml = "/home/reghao/docs/zzz/backend/kvm/xml/pool.xml";
-        Document doc = new SAXReader().read(new FileInputStream(xml));
-        StoragePool storagePool = conn.storagePoolCreateXML(doc.asXML(), 0);
-    }
-
-    public List<PoolInfo> listStoragePool() throws Exception {
-        Connect conn = new Connect(uri, false);
-
-        List<PoolInfo> list = new ArrayList<>();
-        String[] inactivePoolNames = conn.listDefinedStoragePools();
-        for (String poolName : inactivePoolNames) {
-            StoragePool storagePool = conn.storagePoolLookupByName(poolName);
-            list.add(new PoolInfo(storagePool));
-        }
-
-        String[] activePoolNames = conn.listStoragePools();
-        for (String poolName : activePoolNames) {
-            StoragePool storagePool = conn.storagePoolLookupByName(poolName);
-            list.add(new PoolInfo(storagePool));
-        }
-
-        return list;
-    }
-
-    public void deleteStoragePool(String poolName) throws Exception {
-        Connect conn = new Connect(uri, false);
-        StoragePool storagePool = conn.storagePoolLookupByName(poolName);
-        int res = storagePool.isActive();
-        if (res == 1) {
-            storagePool.destroy();
-            storagePool.free();
-        } else if (res == 0) {
-            // 取消处于 inactive 状态的存储池的定义
-            storagePool.undefine();
-            storagePool.destroy();
-            // 释放所有与存储池关联的内存，存储池的状态不会改变
-            storagePool.free();
-        } else {
-            throw new Exception("存储池状态错误...");
-        }
-    }
-
-    public void createStorageVolume(String poolName, int capacity) throws Exception {
-        Connect conn = new Connect(uri, false);
-        StoragePool storagePool = conn.storagePoolLookupByName(poolName);
-
-        String xml = "/home/reghao/docs/zzz/backend/kvm/xml/volume.xml";
-        Document doc = new SAXReader().read(new FileInputStream(xml));
-        StorageVol storageVol = storagePool.storageVolCreateXML(doc.asXML(), 0);
-    }
-
-    public List<VolumeInfo> listStorageVolume(String poolName) throws Exception {
-        Connect conn = new Connect(uri, false);
-        StoragePool storagePool = conn.storagePoolLookupByName(poolName);
-
-        List<VolumeInfo> list = new ArrayList<>();
-        String[] volumeNames = storagePool.listVolumes();
-        for (String volName : volumeNames) {
-            StorageVol storageVol = storagePool.storageVolLookupByName(volName);
-            list.add(new VolumeInfo(storageVol));
-        }
-        return list;
-    }
-
-    public void deleteStorageVolume(String volKey) throws LibvirtException {
-        Connect conn = new Connect(uri, false);
-        StorageVol storageVol = conn.storageVolLookupByKey(volKey);
-        storageVol.delete(0);
-    }
-}