系统重构

eladmin-mnt/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>eladmin</artifactId>
+        <groupId>me.zhengjie</groupId>
+        <version>2.6</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>eladmin-mnt</artifactId>
+    <name>运维模块</name>
+
+    <properties>
+
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>me.zhengjie</groupId>
+            <artifactId>eladmin-logging</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <!-- linux的管理 -->
+        <dependency>
+            <groupId>ch.ethz.ganymed</groupId>
+            <artifactId>ganymed-ssh2</artifactId>
+            <version>build210</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>0.1.55</version>
+        </dependency>
+    </dependencies>
+</project>

eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java

@@ -13,14 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.mnt.domain;
 
-import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseEntity;
+
 import javax.persistence.*;
 import java.io.Serializable;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java

@@ -13,15 +13,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.mnt.domain;
 
-import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseEntity;
-import javax.persistence.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java

@@ -13,14 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.mnt.domain;
 
-import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseEntity;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Set;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java

@@ -13,15 +13,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.mnt.domain;
 
-import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
-import javax.persistence.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.sql.Timestamp;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java

@@ -13,14 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.domain;
+package me.zhengjie.mnt.domain;
 
-import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseEntity;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Objects;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/AppRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.mnt.repository;
 
-import me.zhengjie.modules.mnt.domain.App;
+import me.zhengjie.mnt.domain.App;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DatabaseRepository.java

@@ -13,9 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.mnt.repository;
 
-import me.zhengjie.modules.mnt.domain.Database;
+
+import me.zhengjie.mnt.domain.Database;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployHistoryRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.mnt.repository;
 
-import me.zhengjie.modules.mnt.domain.DeployHistory;
+import me.zhengjie.mnt.domain.DeployHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.mnt.repository;
 
-import me.zhengjie.modules.mnt.domain.Deploy;
+import me.zhengjie.mnt.domain.Deploy;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.repository;
+package me.zhengjie.mnt.repository;
 
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
+import me.zhengjie.mnt.domain.ServerDeploy;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java

@@ -13,21 +13,22 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.mnt.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.AppService;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
+import me.zhengjie.mnt.domain.App;
+import me.zhengjie.mnt.service.AppService;
+import me.zhengjie.mnt.service.dto.AppQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Set;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java

@@ -13,18 +13,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.mnt.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.DatabaseService;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
-import me.zhengjie.modules.mnt.util.SqlUtils;
+import me.zhengjie.mnt.domain.Database;
+import me.zhengjie.mnt.service.DatabaseService;
+import me.zhengjie.mnt.service.dto.DatabaseDto;
+import me.zhengjie.mnt.service.dto.DatabaseQueryCriteria;
+import me.zhengjie.mnt.util.SqlUtils;
 import me.zhengjie.utils.FileUtil;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -33,6 +33,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.mnt.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.DeployService;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
+import me.zhengjie.mnt.domain.Deploy;
+import me.zhengjie.mnt.domain.DeployHistory;
+import me.zhengjie.mnt.service.DeployService;
+import me.zhengjie.mnt.service.dto.DeployQueryCriteria;
 import me.zhengjie.utils.FileUtil;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -31,6 +31,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java

@@ -13,19 +13,20 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.mnt.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
+import me.zhengjie.mnt.service.DeployHistoryService;
+import me.zhengjie.mnt.service.dto.DeployHistoryQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Set;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java

@@ -13,21 +13,22 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.rest;
+package me.zhengjie.mnt.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
+import me.zhengjie.mnt.domain.ServerDeploy;
+import me.zhengjie.mnt.service.ServerDeployService;
+import me.zhengjie.mnt.service.dto.ServerDeployQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Set;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.mnt.service;
 
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
+import me.zhengjie.mnt.domain.App;
+import me.zhengjie.mnt.service.dto.AppDto;
+import me.zhengjie.mnt.service.dto.AppQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.mnt.service;
 
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
+import me.zhengjie.mnt.domain.Database;
+import me.zhengjie.mnt.service.dto.DatabaseDto;
+import me.zhengjie.mnt.service.dto.DatabaseQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.mnt.service;
 
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
+import me.zhengjie.mnt.domain.DeployHistory;
+import me.zhengjie.mnt.service.dto.DeployHistoryDto;
+import me.zhengjie.mnt.service.dto.DeployHistoryQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java

@@ -13,12 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.mnt.service;
 
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
+import me.zhengjie.mnt.domain.Deploy;
+import me.zhengjie.mnt.domain.DeployHistory;
+import me.zhengjie.mnt.service.dto.DeployDto;
+import me.zhengjie.mnt.service.dto.DeployQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java

@@ -13,11 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service;
+package me.zhengjie.mnt.service;
 
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
+
+import me.zhengjie.mnt.domain.ServerDeploy;
+import me.zhengjie.mnt.service.dto.ServerDeployDto;
+import me.zhengjie.mnt.service.dto.ServerDeployQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java

@@ -13,11 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseDTO;
+
 import java.io.Serializable;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppQueryCriteria.java

@@ -13,10 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
+
 import java.sql.Timestamp;
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java

@@ -13,11 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseDTO;
+
 import java.io.Serializable;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseQueryCriteria.java

@@ -13,10 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
+
 import java.sql.Timestamp;
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java

@@ -13,12 +13,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseDTO;
+
 import java.io.Serializable;
 import java.util.Objects;
 import java.util.Set;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java

@@ -13,9 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Data;
+
 import java.io.Serializable;
 import java.sql.Timestamp;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java

@@ -13,10 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
+
 import java.sql.Timestamp;
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java

@@ -13,10 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
+
 import java.sql.Timestamp;
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java

@@ -13,11 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
 import me.zhengjie.base.BaseDTO;
+
 import java.io.Serializable;
 import java.util.Objects;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployQueryCriteria.java

@@ -13,10 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.dto;
+package me.zhengjie.mnt.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
+
 import java.sql.Timestamp;
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java

@@ -13,26 +13,25 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.mnt.service.impl;
 
-import lombok.RequiredArgsConstructor;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.repository.AppRepository;
-import me.zhengjie.modules.mnt.service.AppService;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.AppMapper;
+import me.zhengjie.mnt.domain.App;
+import me.zhengjie.mnt.repository.AppRepository;
+import me.zhengjie.mnt.service.AppService;
+import me.zhengjie.mnt.service.dto.AppDto;
+import me.zhengjie.mnt.service.dto.AppQueryCriteria;
+import me.zhengjie.mnt.service.mapstruct.AppMapper;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
 import me.zhengjie.utils.ValidationUtil;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
@@ -44,9 +43,9 @@ import java.util.*;
 @Service
 public class AppServiceImpl implements AppService {
 	@Autowired
-    private  AppRepository appRepository;
+    private AppRepository appRepository;
 	@Autowired
-    private  AppMapper appMapper;
+    private AppMapper appMapper;
     
  
     @Override

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java

@@ -13,18 +13,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.mnt.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.repository.DatabaseRepository;
-import me.zhengjie.modules.mnt.service.DatabaseService;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
-import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.DatabaseMapper;
-import me.zhengjie.modules.mnt.util.SqlUtils;
+import me.zhengjie.mnt.domain.Database;
+import me.zhengjie.mnt.repository.DatabaseRepository;
+import me.zhengjie.mnt.service.DatabaseService;
+import me.zhengjie.mnt.service.dto.DatabaseDto;
+import me.zhengjie.mnt.service.dto.DatabaseQueryCriteria;
+import me.zhengjie.mnt.service.mapstruct.DatabaseMapper;
+import me.zhengjie.mnt.util.SqlUtils;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
@@ -33,6 +33,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.mnt.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.repository.DeployHistoryRepository;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.DeployHistoryMapper;
+import me.zhengjie.mnt.domain.DeployHistory;
+import me.zhengjie.mnt.repository.DeployHistoryRepository;
+import me.zhengjie.mnt.service.DeployHistoryService;
+import me.zhengjie.mnt.service.dto.DeployHistoryDto;
+import me.zhengjie.mnt.service.dto.DeployHistoryQueryCriteria;
+import me.zhengjie.mnt.service.mapstruct.DeployHistoryMapper;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
@@ -31,6 +31,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java

@@ -13,36 +13,37 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.mnt.service.impl;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.repository.DeployRepository;
-import me.zhengjie.modules.mnt.service.DeployHistoryService;
-import me.zhengjie.modules.mnt.service.DeployService;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
-import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.mapstruct.DeployMapper;
-import me.zhengjie.modules.mnt.util.ExecuteShellUtil;
-import me.zhengjie.modules.mnt.util.ScpClientUtil;
-import me.zhengjie.modules.mnt.websocket.MsgType;
-import me.zhengjie.modules.mnt.websocket.SocketMsg;
-import me.zhengjie.modules.mnt.websocket.WebSocketServer;
+import me.zhengjie.mnt.domain.App;
+import me.zhengjie.mnt.domain.Deploy;
+import me.zhengjie.mnt.domain.DeployHistory;
+import me.zhengjie.mnt.domain.ServerDeploy;
+import me.zhengjie.mnt.repository.DeployRepository;
+import me.zhengjie.mnt.service.DeployHistoryService;
+import me.zhengjie.mnt.service.DeployService;
+import me.zhengjie.mnt.service.ServerDeployService;
+import me.zhengjie.mnt.service.dto.AppDto;
+import me.zhengjie.mnt.service.dto.DeployDto;
+import me.zhengjie.mnt.service.dto.DeployQueryCriteria;
+import me.zhengjie.mnt.service.dto.ServerDeployDto;
+import me.zhengjie.mnt.service.mapstruct.DeployMapper;
+import me.zhengjie.mnt.util.ExecuteShellUtil;
+import me.zhengjie.mnt.util.ScpClientUtil;
 import me.zhengjie.utils.*;
+import me.zhengjie.websocket.MsgType;
+import me.zhengjie.websocket.SocketMsg;
+import me.zhengjie.websocket.WebSocketServer;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.impl;
+package me.zhengjie.mnt.service.impl;
 
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.repository.ServerDeployRepository;
-import me.zhengjie.modules.mnt.service.ServerDeployService;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
-import me.zhengjie.modules.mnt.service.mapstruct.ServerDeployMapper;
-import me.zhengjie.modules.mnt.util.ExecuteShellUtil;
+import me.zhengjie.mnt.domain.ServerDeploy;
+import me.zhengjie.mnt.repository.ServerDeployRepository;
+import me.zhengjie.mnt.service.ServerDeployService;
+import me.zhengjie.mnt.service.dto.ServerDeployDto;
+import me.zhengjie.mnt.service.dto.ServerDeployQueryCriteria;
+import me.zhengjie.mnt.service.mapstruct.ServerDeployMapper;
+import me.zhengjie.mnt.util.ExecuteShellUtil;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
@@ -31,6 +31,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.mnt.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.App;
-import me.zhengjie.modules.mnt.service.dto.AppDto;
+import me.zhengjie.mnt.domain.App;
+import me.zhengjie.mnt.service.dto.AppDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.mnt.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.Database;
-import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
+import me.zhengjie.mnt.domain.Database;
+import me.zhengjie.mnt.service.dto.DatabaseDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.mnt.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.DeployHistory;
-import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
+import me.zhengjie.mnt.domain.DeployHistory;
+import me.zhengjie.mnt.service.dto.DeployHistoryDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.mnt.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.Deploy;
-import me.zhengjie.modules.mnt.service.dto.DeployDto;
+import me.zhengjie.mnt.domain.Deploy;
+import me.zhengjie.mnt.service.dto.DeployDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.service.mapstruct;
+package me.zhengjie.mnt.service.mapstruct;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.mnt.domain.ServerDeploy;
-import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
+import me.zhengjie.mnt.domain.ServerDeploy;
+import me.zhengjie.mnt.service.dto.ServerDeployDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/DataTypeEnum.java

@@ -17,7 +17,7 @@
  *
  */
 
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.mnt.util;
 import lombok.extern.slf4j.Slf4j;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ExecuteShellUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.mnt.util;
 
 import cn.hutool.core.io.IoUtil;
 import com.jcraft.jsch.ChannelShell;
@@ -21,7 +21,9 @@ import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.Session;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
 import java.util.Vector;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.mnt.util;
 
 import ch.ethz.ssh2.Connection;
 import ch.ethz.ssh2.SCPClient;

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java

@@ -13,20 +13,24 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.mnt.util;
+package me.zhengjie.mnt.util;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.util.StringUtils;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.utils.CloseUtil;
+
 import javax.sql.DataSource;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.List;
 
 /**