调整包结构

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/crud/GlobalCrudController.java

@@ -5,8 +5,8 @@ import cn.reghao.autodop.common.utils.data.db.PageList;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.LocalDir;
 import cn.reghao.autodop.dmaster.app.entity.Notification;
-import cn.reghao.autodop.dmaster.app.service.crud.LocalDirCrudService;
-import cn.reghao.autodop.dmaster.app.service.crud.NotificationCrudService;
+import cn.reghao.autodop.dmaster.app.service.crud.global.LocalDirCrudService;
+import cn.reghao.autodop.dmaster.app.service.crud.global.NotificationCrudService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -35,9 +35,7 @@ public class GlobalCrudController {
     @ApiOperation(value = "添加本地目录配置")
     @PostMapping(value = "/localdir", consumes = "application/json")
     public ResponseEntity<String> addLocalDir(@RequestBody String json) throws Exception {
-        LocalDir localDir = (LocalDir) JsonConverter.jsonToObject(json, LocalDir.class);
-        localDirCrudService.addOrModify(localDir);
-        return ResponseEntity.ok().body(WebResult.success("ok"));
+        return ResponseEntity.ok().body(WebResult.success("系统已自动创建..."));
     }
 
     @ApiOperation(value = "分页获取本地目录配置")
@@ -58,8 +56,7 @@ public class GlobalCrudController {
     @ApiOperation(value = "删除本地目录配置")
     @DeleteMapping("/localdir/{uniqueKey}")
     public ResponseEntity<String> deleteLocalDir(@PathVariable("uniqueKey") String uniqueKey) throws Exception {
-        localDirCrudService.delete(uniqueKey);
-        return ResponseEntity.ok().body(WebResult.success("ok"));
+        return ResponseEntity.ok().body(WebResult.success("不允许删除..."));
     }
 
     /* 通知配置 */

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/log/BuildLog.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.dmaster.app.entity.log;
 import cn.reghao.autodop.dmaster.app.entity.BaseEntity;
 import cn.reghao.autodop.dmaster.app.entity.build.AppCompile;
 import cn.reghao.autodop.dmaster.app.entity.build.AppPack;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/log/BuildLogRepository.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.dmaster.app.repository.log;
 import cn.reghao.autodop.dmaster.app.entity.build.AppCompile;
 import cn.reghao.autodop.dmaster.app.entity.build.AppPack;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/log/CommitLogRepository.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.repository.log;
 
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/log/DeployLogRepository.java

@@ -2,7 +2,6 @@ package cn.reghao.autodop.dmaster.app.repository.log;
 
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/log/LogRepository.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.repository.log;
 
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/BuildService.java

@@ -9,7 +9,7 @@ import cn.reghao.autodop.dmaster.app.repository.log.BuildLogRepository;
 import cn.reghao.autodop.dmaster.app.repository.log.CommitLogRepository;
 import cn.reghao.autodop.dmaster.app.repository.log.DeployLogRepository;
 import cn.reghao.autodop.dmaster.app.repository.orchestration.*;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
 import cn.reghao.autodop.common.utils.data.db.PageList;
 import cn.reghao.autodop.dmaster.app.vo.SuccessfullyBuildVO;
 import cn.reghao.autodop.dmaster.app.vo.log.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/OssService.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service;
 
-import cn.reghao.autodop.dmaster.app.service.tools.updater.SvnImpl;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.SvnImpl;
 import cn.reghao.autodop.dmaster.common.utils.AliOss;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/AppIntegrate.java

@@ -13,12 +13,12 @@ import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;
 import cn.reghao.autodop.dmaster.app.entity.orchestration.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.orchestration.ProjOrchestration;
 import cn.reghao.autodop.dmaster.app.service.deploy.AppDeployer;
-import cn.reghao.autodop.dmaster.app.service.tools.compiler.*;
-import cn.reghao.autodop.dmaster.app.service.tools.packer.*;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CodeUpdater;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.GitImpl;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.SvnImpl;
+import cn.reghao.autodop.dmaster.app.service.build.tools.compiler.*;
+import cn.reghao.autodop.dmaster.app.service.build.tools.packer.*;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CodeUpdater;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.GitImpl;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.SvnImpl;
 import cn.reghao.autodop.dmaster.common.config.SysConfig;
 import cn.reghao.autodop.dmaster.common.exception.ExceptionUtil;
 import lombok.AllArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/BuildDispatcher.java

@@ -13,7 +13,7 @@ import cn.reghao.autodop.dmaster.app.repository.log.CommitLogRepository;
 import cn.reghao.autodop.dmaster.app.repository.log.DeployLogRepository;
 import cn.reghao.autodop.dmaster.app.service.deploy.AppDeployer;
 import cn.reghao.autodop.dmaster.app.service.deploy.NotifyTask;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
 import cn.reghao.autodop.dmaster.app.vo.log.BuildDeployResult;
 import cn.reghao.autodop.dmaster.app.entity.orchestration.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.repository.log.LogRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/compiler/CodeCompiler.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/compiler/CodeCompiler.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.compiler;
+package cn.reghao.autodop.dmaster.app.service.build.tools.compiler;
 
 /**
  * 编译代码

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/compiler/MavenCompiler.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/compiler/MavenCompiler.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.compiler;
+package cn.reghao.autodop.dmaster.app.service.build.tools.compiler;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.maven.shared.invoker.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/compiler/NullCompiler.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/compiler/NullCompiler.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.compiler;
+package cn.reghao.autodop.dmaster.app.service.build.tools.compiler;
 
 /**
  * 空编译器

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/compiler/ShellCompiler.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/compiler/ShellCompiler.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.compiler;
+package cn.reghao.autodop.dmaster.app.service.build.tools.compiler;
 
 import cn.reghao.autodop.common.shell.ShellExecutor;
 import cn.reghao.autodop.common.shell.ShellResult;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/packer/CodePacker.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/packer/CodePacker.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.packer;
+package cn.reghao.autodop.dmaster.app.service.build.tools.packer;
 
 /**
  * 打包应用

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.packer;
+package cn.reghao.autodop.dmaster.app.service.build.tools.packer;
 
 import cn.reghao.autodop.common.dockerc.DockerClient;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/packer/ZipPack.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/packer/ZipPack.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.packer;
+package cn.reghao.autodop.dmaster.app.service.build.tools.packer;
 
 import cn.reghao.autodop.common.utils.compression.ZipFiles;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/updater/ChangedFile.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/updater/ChangedFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.updater;
+package cn.reghao.autodop.dmaster.app.service.build.tools.updater;
 
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/updater/CodeUpdater.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/updater/CodeUpdater.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.updater;
+package cn.reghao.autodop.dmaster.app.service.build.tools.updater;
 
 /**
  * 更新代码

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/updater/CommitLog.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/updater/CommitLog.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.updater;
+package cn.reghao.autodop.dmaster.app.service.build.tools.updater;
 
 import cn.reghao.autodop.dmaster.app.entity.BaseEntity;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/updater/GitImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/updater/GitImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.updater;
+package cn.reghao.autodop.dmaster.app.service.build.tools.updater;
 
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/updater/SvnImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/updater/SvnImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.tools.updater;
+package cn.reghao.autodop.dmaster.app.service.build.tools.updater;
 
 import org.tmatesoft.svn.core.*;
 import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.crud;
+package cn.reghao.autodop.dmaster.app.service.crud.global;
 
 import cn.reghao.autodop.common.utils.data.db.CrudOps;
 import cn.reghao.autodop.common.utils.data.db.PageList;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.crud;
+package cn.reghao.autodop.dmaster.app.service.crud.global;
 
 import cn.reghao.autodop.common.utils.data.db.CrudOps;
 import cn.reghao.autodop.common.utils.data.db.PageList;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/log/CommitLogVO.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.vo.log;
 
 import cn.reghao.autodop.common.utils.DatetimeConverter;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.ChangedFile;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.ChangedFile;
+import cn.reghao.autodop.dmaster.app.service.build.tools.updater.CommitLog;
 import lombok.Data;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/jwt/JwtTokenFilter.java

@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
  * @date 2019-11-18 10:00:22
  */
 public class JwtTokenFilter extends OncePerRequestFilter {
-    private final String uriPattern = "/api/app3&/api/monitor&/api/vm";
+    private final String uriPattern = "/api/app3&/api/monitor&/api/vm&/api/config";
 
     private boolean matchUri(String uri) {
         for (String str : uriPattern.split("&")) {