调整 app 模块的 crud 接口

dagent/src/main/java/cn/reghao/autodop/dagent/app/App.java

@@ -32,7 +32,7 @@ public class App {
     }
 
     public RpcResult deploy(String payload) {
-        AppDeployArgs appDeployArgs = (AppDeployArgs) JsonConverter.jsonToObject(payload, AppDeployArgs.class);
+        AppDeployArgs appDeployArgs = JsonConverter.jsonToObject(payload, AppDeployArgs.class);
         String packerType = appDeployArgs.getPackerType();
 
         DeployedAppStatus deployedAppStatus;
@@ -55,7 +55,7 @@ public class App {
 
     public RpcResult log(String payload) {
         try {
-            AppLogArgs appLogArgs = (AppLogArgs) JsonConverter.jsonToObject(payload, AppLogArgs.class);
+            AppLogArgs appLogArgs = JsonConverter.jsonToObject(payload, AppLogArgs.class);
             String packerType = appLogArgs.getPackerType();
             long count = appLogArgs.getLogConfigs().stream().filter(LogConfig::getIsDir).count();
 
@@ -85,7 +85,7 @@ public class App {
     }
 
     public RpcResult status(String payload) {
-        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
         String appId = appIdArgs.getAppId();
         String packerType = appIdArgs.getPackerType();
 
@@ -108,7 +108,7 @@ public class App {
     }
 
     public RpcResult restart(String payload) {
-        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
         String appId = appIdArgs.getAppId();
         String packerType = appIdArgs.getPackerType();
 
@@ -131,7 +131,7 @@ public class App {
     }
 
     public RpcResult stop(String payload) {
-        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
         String appId = appIdArgs.getAppId();
         String packerType = appIdArgs.getPackerType();
 
@@ -154,7 +154,7 @@ public class App {
     }
 
     public RpcResult start(String payload) {
-        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
         String appId = appIdArgs.getAppId();
         String packerType = appIdArgs.getPackerType();
 

dagent/src/main/java/cn/reghao/autodop/dagent/utils/amqp/DagentConsumer.java

@@ -42,7 +42,7 @@ public class DagentConsumer implements ChannelAwareMessageListener {
         long startTime = ManagementFactory.getRuntimeMXBean().getStartTime();
         String body = new String(msg.getBody());
         try {
-            MqMessage mqMessage = (MqMessage) JsonConverter.jsonToObject(body, MqMessage.class);
+            MqMessage mqMessage = JsonConverter.jsonToObject(body, MqMessage.class);
             String machineId = mqMessage.getMachineId();
             long sendTime = mqMessage.getSendTime();
             boolean isRpc = mqMessage.isRpc();

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/cache/BuildDeployCache.java

@@ -4,8 +4,8 @@ import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.repository.log.BuildLogRepository;
-import cn.reghao.autodop.dmaster.app.repository.config.AppConfigRepository;
-import cn.reghao.autodop.dmaster.app.repository.config.ProjConfigRepository;
+import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.repository.config.ProjOrchestrationRepository;
 import cn.reghao.autodop.dmaster.machine.entity.MachineInfo;
 import cn.reghao.autodop.dmaster.machine.repository.MachineInfoRepository;
 import org.springframework.cache.annotation.Cacheable;
@@ -22,13 +22,13 @@ import java.util.List;
 @Service
 public class BuildDeployCache {
     private MachineInfoRepository machineInfoRepository;
-    private AppConfigRepository appRepository;
-    private ProjConfigRepository projRepository;
+    private AppOrchestrationRepository appRepository;
+    private ProjOrchestrationRepository projRepository;
     private BuildLogRepository buildLogRepository;
 
     public BuildDeployCache(MachineInfoRepository machineInfoRepository,
-                            AppConfigRepository appRepository,
-                            ProjConfigRepository projRepository,
+                            AppOrchestrationRepository appRepository,
+                            ProjOrchestrationRepository projRepository,
                             BuildLogRepository buildLogRepository) {
         this.machineInfoRepository = machineInfoRepository;
         this.appRepository = appRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/AppConfigController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/crud/AppConfigController.java

@@ -1,12 +1,12 @@
-package cn.reghao.autodop.dmaster.app.controller.config;
+package cn.reghao.autodop.dmaster.app.controller.crud;
 
 import cn.reghao.autodop.common.result.WebResult;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.service.config.app.AppCrudService;
-import cn.reghao.autodop.dmaster.app.service.config.app.ProjCrudService;
+import cn.reghao.autodop.dmaster.app.service.crud.AppOrchestrationService;
+import cn.reghao.autodop.dmaster.app.service.crud.ProjOrchestrationService;
 import cn.reghao.autodop.dmaster.app.vo.orchestration.AppVO;
 import cn.reghao.autodop.dmaster.app.vo.orchestration.ProjVO;
 import io.swagger.annotations.Api;
@@ -26,21 +26,21 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/api/config/orchestrate")
 public class AppConfigController {
-    private AppCrudService appCrudService;
-    private ProjCrudService projCrudService;
+    private AppOrchestrationService appOrchestrationService;
+    private ProjOrchestrationService projOrchestrationService;
 
-    public AppConfigController(AppCrudService appCrudService, ProjCrudService projCrudService) {
-        this.appCrudService = appCrudService;
-        this.projCrudService = projCrudService;
+    public AppConfigController(AppOrchestrationService appOrchestrationService, ProjOrchestrationService projOrchestrationService) {
+        this.appOrchestrationService = appOrchestrationService;
+        this.projOrchestrationService = projOrchestrationService;
     }
 
     /* 应用配置 */
     @ApiOperation(value = "添加应用编排")
     @PostMapping(value = "/app", consumes = "application/json")
     public ResponseEntity<String> addAppOrchestration(@RequestBody String json) throws Exception {
-        AppVO appVO = (AppVO) JsonConverter.jsonToObject(json, AppVO.class);
+        AppVO appVO = JsonConverter.jsonToObject(json, AppVO.class);
         AppOrchestration app = AppVO.to(appVO);
-        appCrudService.addOrUpdate(app);
+        appOrchestrationService.insert(app);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -48,23 +48,23 @@ public class AppConfigController {
     @PostMapping(value = "/app/copy")
     public ResponseEntity<String> copyAppOrchestration(@RequestParam("from") String from,
                                                        @RequestParam("to") String to) throws Exception {
-        appCrudService.copy(from, to);
+        appOrchestrationService.copy(from, to);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
     @ApiOperation(value = "修改应用编排")
     @PutMapping("/app")
     public ResponseEntity<String> modifyAppOrchestration(@RequestBody String json) throws Exception {
-        AppVO appVO = (AppVO) JsonConverter.jsonToObject(json, AppVO.class);
+        AppVO appVO = JsonConverter.jsonToObject(json, AppVO.class);
         AppOrchestration app = AppVO.to(appVO);
-        appCrudService.update(app);
+        appOrchestrationService.update(app);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
     @ApiOperation(value = "删除应用编排")
     @DeleteMapping("/app/{uniqueKey}")
     public ResponseEntity<String> deleteAppOrchestration(@PathVariable("uniqueKey") String uniqueKey) throws Exception {
-        appCrudService.delete(uniqueKey);
+        appOrchestrationService.delete(uniqueKey);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -73,7 +73,7 @@ public class AppConfigController {
     public ResponseEntity<String> getAppOrchestrationByPage(@RequestParam("page") int page,
                                                             @RequestParam("size") int size,
                                                             @RequestParam("env") String env) {
-        PageList<AppOrchestration> pageList = appCrudService.getByPage(page, size, env);
+        PageList<AppOrchestration> pageList = appOrchestrationService.getByPage(page, size, env);
         PageList<AppVO> vos = new PageList<>();
         vos.setTotalPages(pageList.getTotalPages());
         vos.setTotalSize(pageList.getTotalSize());
@@ -87,9 +87,9 @@ public class AppConfigController {
     @ApiOperation(value = "添加项目编排")
     @PostMapping(value = "/proj", consumes = "application/json")
     public ResponseEntity<String> addProjOrchestration(@RequestBody String json) throws Exception {
-        ProjVO projVO = (ProjVO) JsonConverter.jsonToObject(json, ProjVO.class);
+        ProjVO projVO = JsonConverter.jsonToObject(json, ProjVO.class);
         ProjOrchestration proj = ProjVO.to(projVO);
-        projCrudService.addOrUpdate(proj);
+        projOrchestrationService.insert(proj);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -97,22 +97,22 @@ public class AppConfigController {
     @PostMapping(value = "/proj/copy")
     public ResponseEntity<String> copyProjOrchestration(@RequestParam("from") String from,
                                                        @RequestParam("to") String to) throws Exception {
-        projCrudService.copy(from, to);
+        projOrchestrationService.copy(from, to);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
     @ApiOperation(value = "修改项目编排")
     @PutMapping("/proj")
     public ResponseEntity<String> modifyProjOrchestration(@RequestBody String json) throws Exception {
-        ProjOrchestration proj = (ProjOrchestration) JsonConverter.jsonToObject(json, ProjOrchestration.class);
-        projCrudService.addOrUpdate(proj);
+        ProjOrchestration proj = JsonConverter.jsonToObject(json, ProjOrchestration.class);
+        projOrchestrationService.insert(proj);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
     @ApiOperation(value = "删除项目编排")
     @DeleteMapping("/proj/{uniqueKey}")
     public ResponseEntity<String> deleteProjOrchestration(@PathVariable("uniqueKey") String uniqueKey) throws Exception {
-        projCrudService.delete(uniqueKey);
+        projOrchestrationService.delete(uniqueKey);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -121,7 +121,7 @@ public class AppConfigController {
     public ResponseEntity<String> getProjOrchestrationByPage(@RequestParam("page") int page,
                                                              @RequestParam("size") int size,
                                                              @RequestParam("env") String env) {
-        PageList<ProjOrchestration> pageList = projCrudService.getByPage(page, size, env);
+        PageList<ProjOrchestration> pageList = projOrchestrationService.getByPage(page, size, env);
         PageList<ProjVO> vos = new PageList<>();
         vos.setTotalPages(pageList.getTotalPages());
         vos.setTotalSize(pageList.getTotalSize());

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/BuildConfigController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/crud/BuildConfigController.java

@@ -1,16 +1,16 @@
-package cn.reghao.autodop.dmaster.app.controller.config;
+package cn.reghao.autodop.dmaster.app.controller.crud;
 
 import cn.reghao.autodop.common.result.WebResult;
 import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
-import cn.reghao.autodop.dmaster.app.service.config.build.BuildDirService;
+import cn.reghao.autodop.dmaster.app.service.crud.BuildDirService;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.service.config.build.CompilerConfigService;
-import cn.reghao.autodop.dmaster.app.service.config.build.PackerConfigService;
-import cn.reghao.autodop.dmaster.app.service.config.build.RepoAuthConfigService;
+import cn.reghao.autodop.dmaster.app.service.crud.CompilerConfigService;
+import cn.reghao.autodop.dmaster.app.service.crud.PackerConfigService;
+import cn.reghao.autodop.dmaster.app.service.crud.RepoAuthConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +42,10 @@ public class BuildConfigController {
     }
 
     /* 构建配置 */
-    @ApiOperation(value = "获取构建目录配置")
+    @ApiOperation(value = "分页获取构建目录配置")
     @GetMapping("/dir")
     public ResponseEntity<String> getBuildDirByPage(@RequestParam("page") int page, @RequestParam("size") int size) {
-        PageList<BuildDir> pageList = buildDirService.getByPage(page, size);
+        PageList<BuildDir> pageList = buildDirService.getByPage(page, size, "");
         return ResponseEntity.ok().body(WebResult.success(pageList));
     }
 
@@ -61,7 +61,7 @@ public class BuildConfigController {
     @PostMapping(value = "/repo", consumes = "application/json")
     public ResponseEntity<String> addRepoConfig(@RequestBody String json) throws Exception {
         RepoAuthConfig repoAuthConfig = JsonConverter.jsonToObject(json, RepoAuthConfig.class);
-        repoAuthConfigService.addOrUpdate(repoAuthConfig);
+        repoAuthConfigService.insert(repoAuthConfig);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -69,7 +69,7 @@ public class BuildConfigController {
     @PutMapping("/repo")
     public ResponseEntity<String> modifyRepoConfig(@RequestBody String json) throws Exception {
         RepoAuthConfig repoAuthConfig = JsonConverter.jsonToObject(json, RepoAuthConfig.class);
-        repoAuthConfigService.addOrUpdate(repoAuthConfig);
+        repoAuthConfigService.insert(repoAuthConfig);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -83,7 +83,7 @@ public class BuildConfigController {
     @ApiOperation(value = "分页获取仓库认证配置")
     @GetMapping("/repo")
     public ResponseEntity<String> getRepoConfigByPage(@RequestParam("page") int page, @RequestParam("size") int size) {
-        PageList<RepoAuthConfig> pageList = repoAuthConfigService.getByPage(page, size);
+        PageList<RepoAuthConfig> pageList = repoAuthConfigService.getByPage(page, size, "");
         return ResponseEntity.ok().body(WebResult.success(pageList));
     }
 
@@ -92,7 +92,7 @@ public class BuildConfigController {
     @PostMapping(value = "/compiler", consumes = "application/json")
     public ResponseEntity<String> addCompileConfig(@RequestBody String json) throws Exception {
         CompilerConfig compilerConfig = JsonConverter.jsonToObject(json, CompilerConfig.class);
-        compilerConfigService.addOrUpdate(compilerConfig);
+        compilerConfigService.insert(compilerConfig);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -100,7 +100,7 @@ public class BuildConfigController {
     @PutMapping("/compiler")
     public ResponseEntity<String> modifyCompileConfig(@RequestBody String json) throws Exception {
         CompilerConfig compilerConfig = JsonConverter.jsonToObject(json, CompilerConfig.class);
-        compilerConfigService.addOrUpdate(compilerConfig);
+        compilerConfigService.insert(compilerConfig);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -114,7 +114,7 @@ public class BuildConfigController {
     @ApiOperation(value = "分页获取应用编译配置")
     @GetMapping("/compiler")
     public ResponseEntity<String> getCompileConfigByPage(@RequestParam("page") int page, @RequestParam("size") int size) {
-        PageList<CompilerConfig> pageList = compilerConfigService.getByPage(page, size);
+        PageList<CompilerConfig> pageList = compilerConfigService.getByPage(page, size, "");
         return ResponseEntity.ok().body(WebResult.success(pageList));
     }
 
@@ -123,7 +123,7 @@ public class BuildConfigController {
     @PostMapping(value = "/packer", consumes = "application/json")
     public ResponseEntity<String> addPackConfig(@RequestBody String json) throws Exception {
         PackerConfig packerConfig = JsonConverter.jsonToObject(json, PackerConfig.class);
-        packerConfigService.addOrUpdate(packerConfig);
+        packerConfigService.insert(packerConfig);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -131,7 +131,7 @@ public class BuildConfigController {
     @PutMapping("/packer")
     public ResponseEntity<String> modifyPackConfig(@RequestBody String json) throws Exception {
         PackerConfig packerConfig = JsonConverter.jsonToObject(json, PackerConfig.class);
-        packerConfigService.addOrUpdate(packerConfig);
+        packerConfigService.insert(packerConfig);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -145,7 +145,7 @@ public class BuildConfigController {
     @ApiOperation(value = "分页获取应用打包配置")
     @GetMapping("/packer")
     public ResponseEntity<String> getPackConfigByPage(@RequestParam("page") int page, @RequestParam("size") int size) {
-        PageList<PackerConfig> pageList = packerConfigService.getByPage(page, size);
+        PageList<PackerConfig> pageList = packerConfigService.getByPage(page, size, "");
         return ResponseEntity.ok().body(WebResult.success(pageList));
     }
 }

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.entity.log;
 
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.service.build.tools.repo.CommitInfo;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
 import cn.reghao.autodop.common.orm.BaseDocument;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/exception/GitException.java

@@ -1,13 +0,0 @@
-package cn.reghao.autodop.dmaster.app.exception;
-
-import org.eclipse.jgit.api.errors.GitAPIException;
-
-/**
- * @author reghao
- * @date 2021-02-11 10:14:36
- */
-public class GitException extends GitAPIException {
-    public GitException(String msg) {
-        super(msg);
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/exception/UpdateException.java

@@ -1,11 +0,0 @@
-package cn.reghao.autodop.dmaster.app.exception;
-
-/**
- * @author reghao
- * @date 2021-02-11 10:14:36
- */
-public class UpdateException extends GitException {
-    public UpdateException(String msg) {
-        super(msg);
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/interceptor/MethodTimeInterceptor.java

@@ -1,41 +0,0 @@
-package cn.reghao.autodop.dmaster.app.interceptor;
-
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.util.StopWatch;
-
-/**
- * 方法执行时间
- * TODO 无法监控其他线程中的方法执行时间
- *
- * @author reghao
- * @date 2020-03-06 16:04:27
- */
-@Slf4j
-//@Component
-//@Aspect
-public class MethodTimeInterceptor {
-    // 拦截 cn.reghao.autodop.dmaster.app.service.build 包中的所有方法
-    private final static String POINT = "execution (* cn.reghao.autodop.dmaster.app.controller..*.*(..))";
-
-    @Pointcut(POINT)
-    public void timeConsumed(){
-    }
-
-    @Around("timeConsumed()")
-    public Object around(ProceedingJoinPoint joinPoint) throws Throwable{
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start();
-        Object obj = joinPoint.proceed(joinPoint.getArgs());
-        stopWatch.stop();
-
-        long ms = stopWatch.getTotalTimeMillis();
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        String methodName = signature.getDeclaringTypeName() + "." + signature.getName();
-        log.info("{} costs {}ms", methodName, ms);
-        return obj;
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/AppConfigRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/AppOrchestrationRepository.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author reghao
  * @date 2020-01-21 14:53:03
  */
-public interface AppConfigRepository extends JpaRepository<AppOrchestration, Long>, JpaSpecificationExecutor<AppOrchestration> {
+public interface AppOrchestrationRepository extends JpaRepository<AppOrchestration, Long>, JpaSpecificationExecutor<AppOrchestration> {
     List<AppOrchestration> findAllByIsDeleteFalseAndEnableTrueAndEnv(String env);
     List<AppOrchestration> findAllByIsDeleteFalseAndEnableTrueAndAppType(String appType);
     Page<AppOrchestration> findByIsDeleteFalse(Pageable pageable);

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/ProjConfigRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/ProjOrchestrationRepository.java

@@ -11,7 +11,7 @@ import javax.transaction.Transactional;
  * @author reghao
  * @date 2020-01-21 14:53:03
  */
-public interface ProjConfigRepository extends JpaRepository<ProjOrchestration, Long> {
+public interface ProjOrchestrationRepository extends JpaRepository<ProjOrchestration, Long> {
     ProjOrchestration findByIsDeleteFalseAndProjId(String projId);
     //Page<ProjOrchestration> findByIsDeleteFalseAndEnv(String env, Pageable pageable);
 

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

@@ -6,14 +6,11 @@ import cn.reghao.autodop.common.amqp.RpcResult;
 import cn.reghao.autodop.common.dagent.app.api.AppOps;
 import cn.reghao.autodop.common.dagent.app.api.data.AppIdArgs;
 import cn.reghao.autodop.common.dagent.app.api.data.DeployedAppStatus;
-import cn.reghao.autodop.common.dagent.app.api.data.log.AppLogArgs;
-import cn.reghao.autodop.common.dagent.app.api.data.log.LogConfig;
-import cn.reghao.autodop.common.utils.serializer.JsonArrayDeserializer;
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.cache.BuildDeployCache;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.DeployConfig;
-import cn.reghao.autodop.dmaster.app.service.config.log.AppStatusCrudService;
+import cn.reghao.autodop.dmaster.app.service.log.AppStatusCrudService;
 import cn.reghao.autodop.common.dagent.app.api.data.log.LogFile;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import org.springframework.stereotype.Service;
@@ -22,7 +19,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 应用状态管理
@@ -242,7 +238,7 @@ public class AppStatusService {
             RpcResult rpcResult = entry.getValue();
             if (rpcResult.getStatusCode() == 0) {
                 DeployedAppStatus deployedAppStatus =
-                        (DeployedAppStatus) JsonConverter.jsonToObject(rpcResult.getResult(), DeployedAppStatus.class);
+                        JsonConverter.jsonToObject(rpcResult.getResult(), DeployedAppStatus.class);
                 deployedAppStatus.setEnv(app.getEnv());
                 map.put(machineId, deployedAppStatus);
             }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/BuildDeployAppCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/BuildDeployAppCrudService.java

@@ -1,9 +1,10 @@
-package cn.reghao.autodop.dmaster.app.service.config;
+package cn.reghao.autodop.dmaster.app.service;
 
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import cn.reghao.autodop.dmaster.app.entity.status.BuildDeployApp;
 import cn.reghao.autodop.dmaster.app.repository.status.BuildDeployAppRepository;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -28,7 +29,7 @@ public class BuildDeployAppCrudService implements CrudOps<BuildDeployApp> {
 
     //@CachePut(cacheNames = { "app" }, key = "#buildDeployApp.appId")
     @Override
-    public void add(BuildDeployApp buildDeployApp) {
+    public void insert(BuildDeployApp buildDeployApp) {
         BuildDeployApp entity = buildDeployAppRepository.findByAppId(buildDeployApp.getAppId());
         if (entity == null) {
             buildDeployApp.setIsDelete(false);
@@ -37,14 +38,15 @@ public class BuildDeployAppCrudService implements CrudOps<BuildDeployApp> {
     }
 
     @Override
-    public void batchAdd(List<BuildDeployApp> buildDeployApps) {
+    public void batchInsert(List<BuildDeployApp> buildDeployApps) {
         buildDeployAppRepository.saveAll(buildDeployApps.stream()
                 .peek(buildDeployApp -> buildDeployApp.setIsDelete(false))
                 .collect(Collectors.toList()));
     }
 
+    //@CacheEvict(cacheNames = { "app" }, key = "#buildDeployApp.appId")
     @Override
-    public void addOrUpdate(BuildDeployApp buildDeployApp) throws Exception {
+    public void update(BuildDeployApp buildDeployApp) throws Exception {
         BuildDeployApp entity = buildDeployAppRepository.findByAppId(buildDeployApp.getAppId());
         if (entity != null) {
             buildDeployApp.setId(entity.getId());
@@ -55,19 +57,6 @@ public class BuildDeployAppCrudService implements CrudOps<BuildDeployApp> {
         buildDeployAppRepository.save(buildDeployApp);
     }
 
-    //@CacheEvict(cacheNames = { "app" }, key = "#buildDeployApp.appId")
-    @Override
-    public void update(BuildDeployApp buildDeployApp) {
-        BuildDeployApp entity = buildDeployAppRepository.findByAppId(buildDeployApp.getAppId());
-        if (entity != null) {
-            buildDeployApp.setId(entity.getId());
-            buildDeployApp.setCreateTime(entity.getCreateTime());
-            buildDeployApp.setUpdateTime(LocalDateTime.now());
-            buildDeployApp.setIsDelete(false);
-            buildDeployAppRepository.save(buildDeployApp);
-        }
-    }
-
     @Override
     public PageList<BuildDeployApp> getByPage(int page, int size, String env) {
         // 按最近更新时间降序

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

@@ -4,16 +4,14 @@ import cn.reghao.autodop.common.utils.DateTimeConverter;
 import cn.reghao.autodop.dmaster.app.cache.BuildDeployCache;
 import cn.reghao.autodop.dmaster.app.constant.BuildDeployResult;
 import cn.reghao.autodop.dmaster.app.constant.BuildStage;
-import cn.reghao.autodop.dmaster.app.entity.config.NotifyReceiver;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.DeployConfig;
 import cn.reghao.autodop.dmaster.app.entity.log.*;
 import cn.reghao.autodop.dmaster.app.entity.status.BuildDeployApp;
 import cn.reghao.autodop.dmaster.app.interceptor.AppIntegrateReinitInterceptor;
-import cn.reghao.autodop.dmaster.app.service.build.AppIntegrate;
-import cn.reghao.autodop.dmaster.app.service.build.tools.repo.CommitInfo;
-import cn.reghao.autodop.dmaster.app.service.deploy.AppDeployer;
+import cn.reghao.autodop.dmaster.app.service.bd.AppIntegrate;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
+import cn.reghao.autodop.dmaster.app.service.bd.AppDeployer;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.service.deploy.DeployNotifyMsg;
 import cn.reghao.autodop.dmaster.app.service.log.BuildDeployLogConsumer;
 import cn.reghao.autodop.common.utils.ExceptionUtil;
 import cn.reghao.autodop.dmaster.utils.notifier.NotifyService;

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

@@ -4,14 +4,13 @@ import cn.reghao.autodop.dmaster.app.cache.BuildDeployCache;
 import cn.reghao.autodop.dmaster.app.entity.status.BuildDeployApp;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;
-import cn.reghao.autodop.dmaster.app.repository.config.AppConfigRepository;
+import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;
 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.entity.log.CommitLog;
 import cn.reghao.autodop.dmaster.app.repository.status.BuildDeployAppRepository;
 import cn.reghao.autodop.dmaster.common.db.PageList;
-import cn.reghao.autodop.dmaster.app.service.config.BuildDeployAppCrudService;
 import cn.reghao.autodop.dmaster.app.vo.CurrentRunningCommit;
 import cn.reghao.autodop.dmaster.app.vo.SuccessfullyBuildVO;
 import org.springframework.data.domain.Page;
@@ -27,7 +26,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class BuildService {
-    private AppConfigRepository appConfigRepository;
+    private AppOrchestrationRepository appOrchestrationRepository;
     private BuildDeployCache cache;
     private BuildDeployAppCrudService buildDeployAppCrudService;
     private CommitLogRepository commitLogRepository;
@@ -35,7 +34,7 @@ public class BuildService {
     private DeployLogRepository deployLogRepository;
     private BuildDeployAppRepository buildDeployAppRepository;
 
-    public BuildService(AppConfigRepository appConfigRepository,
+    public BuildService(AppOrchestrationRepository appOrchestrationRepository,
                         BuildDeployCache cache,
                         BuildDeployAppCrudService buildDeployAppCrudService,
                         CommitLogRepository commitLogRepository,

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.build.tools.repo.SvnImpl;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.SvnImpl;
 import cn.reghao.autodop.dmaster.utils.AliOss;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -2,10 +2,9 @@ package cn.reghao.autodop.dmaster.app.service;
 
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.status.BuildDeployApp;
-import cn.reghao.autodop.dmaster.app.repository.config.AppConfigRepository;
+import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;
 import cn.reghao.autodop.dmaster.app.repository.log.DeployLogRepository;
 import cn.reghao.autodop.dmaster.app.repository.status.BuildDeployAppRepository;
-import cn.reghao.autodop.dmaster.app.service.config.BuildDeployAppCrudService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -23,16 +22,16 @@ import java.util.stream.Collectors;
  */
 @Service
 public class RefreshService {
-    private AppConfigRepository appConfigRepository;
+    private AppOrchestrationRepository appOrchestrationRepository;
     private BuildDeployAppRepository buildDeployAppRepository;
     private BuildDeployAppCrudService buildDeployAppCrudService;
     private DeployLogRepository deployLogRepository;
 
-    public RefreshService(AppConfigRepository appConfigRepository,
+    public RefreshService(AppOrchestrationRepository appOrchestrationRepository,
                           BuildDeployAppRepository buildDeployAppRepository,
                           BuildDeployAppCrudService buildDeployAppCrudService,
                           DeployLogRepository deployLogRepository) {
-        this.appConfigRepository = appConfigRepository;
+        this.appOrchestrationRepository = appOrchestrationRepository;
         this.buildDeployAppRepository = buildDeployAppRepository;
         this.buildDeployAppCrudService = buildDeployAppCrudService;
         this.deployLogRepository = deployLogRepository;
@@ -53,7 +52,7 @@ public class RefreshService {
 
         int page = 1;
         int size = 50;
-        Page<AppOrchestration> appConfigPage = appConfigRepository.findByIsDeleteFalseAndEnv(env, pageRequest(page, size));
+        Page<AppOrchestration> appConfigPage = appOrchestrationRepository.findByIsDeleteFalseAndEnv(env, pageRequest(page, size));
         List<AppOrchestration> apps = appConfigPage.stream()
                 .filter(appConfig -> !buildDeployAppIds.contains(appConfig.getAppId()))
                 .collect(Collectors.toList());
@@ -61,7 +60,7 @@ public class RefreshService {
         refresh(apps);
         while (appConfigPage.hasNext()) {
             page++;
-            appConfigPage = appConfigRepository.findByIsDeleteFalseAndEnv(env, pageRequest(page, size));
+            appConfigPage = appOrchestrationRepository.findByIsDeleteFalseAndEnv(env, pageRequest(page, size));
             apps = appConfigPage.stream()
                     .filter(appConfig -> !buildDeployAppIds.contains(appConfig.getAppId()))
                     .collect(Collectors.toList());
@@ -83,7 +82,7 @@ public class RefreshService {
     private void refresh(List<AppOrchestration> appOrchestrations) {
         List<BuildDeployApp> list = appOrchestrations.stream().map(BuildDeployApp::of).collect(Collectors.toList());
         if (!list.isEmpty()) {
-            buildDeployAppCrudService.batchAdd(list);
+            buildDeployAppCrudService.batchInsert(list);
         }
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/deploy/AppDeployer.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/AppDeployer.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.deploy;
+package cn.reghao.autodop.dmaster.app.service.bd;
 
 import cn.reghao.autodop.common.amqp.MqMessage;
 import cn.reghao.autodop.common.amqp.MessageType;
@@ -61,7 +61,7 @@ public class AppDeployer {
             appDeployArgs.setStartHome(deployConfig.getStartHome());
             appDeployArgs.setStartScript(deployConfig.getStartScript());
             String config = deployConfig.getDockerConfig();
-            appDeployArgs.setDockerConfig((Config) JsonConverter.jsonToObject(config, Config.class));
+            appDeployArgs.setDockerConfig(JsonConverter.jsonToObject(config, Config.class));
 
             MqMessage mqMessage = new MqMessage();
             mqMessage.setMachineId(deployConfig.getMachineId());
@@ -86,7 +86,7 @@ public class AppDeployer {
             deployLog.setStatusCode(rpcResult.getStatusCode());
             if (rpcResult.getStatusCode() == 0) {
                 DeployedAppStatus deployedAppStatus =
-                        (DeployedAppStatus) JsonConverter.jsonToObject(rpcResult.getResult(), DeployedAppStatus.class);
+                        JsonConverter.jsonToObject(rpcResult.getResult(), DeployedAppStatus.class);
                 deployedAppStatus.setAppType(buildLog.getAppType());
                 deployedAppStatus.setEnv(buildLog.getEnv());
                 deployedAppStatus.setCommitId(buildLog.getCommitId());

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.build;
+package cn.reghao.autodop.dmaster.app.service.bd;
 
 import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import cn.reghao.autodop.dmaster.app.constant.build.CompileType;
@@ -9,17 +9,17 @@ import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.service.build.tools.compiler.CodeCompiler;
-import cn.reghao.autodop.dmaster.app.service.build.tools.compiler.MavenCompiler;
-import cn.reghao.autodop.dmaster.app.service.build.tools.compiler.NullCompiler;
-import cn.reghao.autodop.dmaster.app.service.build.tools.compiler.ShellCompiler;
-import cn.reghao.autodop.dmaster.app.service.build.tools.packer.CodePacker;
-import cn.reghao.autodop.dmaster.app.service.build.tools.packer.DockerPack;
-import cn.reghao.autodop.dmaster.app.service.build.tools.packer.ZipPack;
-import cn.reghao.autodop.dmaster.app.service.build.tools.repo.CodeUpdater;
-import cn.reghao.autodop.dmaster.app.service.build.tools.repo.CommitInfo;
-import cn.reghao.autodop.dmaster.app.service.build.tools.repo.GitImpl;
-import cn.reghao.autodop.dmaster.app.service.build.tools.repo.SvnImpl;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.compiler.CodeCompiler;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.compiler.MavenCompiler;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.compiler.NullCompiler;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.compiler.ShellCompiler;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.packer.CodePacker;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.packer.DockerPack;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.packer.ZipPack;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CodeUpdater;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.GitImpl;
+import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.SvnImpl;
 import cn.reghao.autodop.dmaster.common.config.SysConfig;
 import lombok.AllArgsConstructor;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/BuilderUtil.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/BuilderUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.build;
+package cn.reghao.autodop.dmaster.app.service.bd;
 
 import cn.reghao.autodop.common.utils.FileOps;
 import cn.reghao.autodop.common.utils.text.ReplaceCharacter;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/deploy/DeployNotifyMsg.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/DeployNotifyMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.deploy;
+package cn.reghao.autodop.dmaster.app.service.bd;
 
 import cn.reghao.autodop.common.utils.DateTimeConverter;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.build.tools.compiler;
+package cn.reghao.autodop.dmaster.app.service.bd.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/build/tools/packer/CodePacker.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/tools/packer/CodePacker.java

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

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.build.tools.packer;
+package cn.reghao.autodop.dmaster.app.service.bd.tools.packer;
 
 import cn.reghao.autodop.common.docker.Docker;
 import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.build.tools.packer;
+package cn.reghao.autodop.dmaster.app.service.bd.tools.packer;
 
 import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
 import lombok.extern.slf4j.Slf4j;

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

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

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/repo/CommitInfo.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/tools/repo/CommitInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.build.tools.repo;
+package cn.reghao.autodop.dmaster.app.service.bd.tools.repo;
 
 import cn.reghao.autodop.dmaster.app.entity.log.ChangedFile;
 import lombok.Data;

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

@@ -1,10 +1,9 @@
-package cn.reghao.autodop.dmaster.app.service.build.tools.repo;
+package cn.reghao.autodop.dmaster.app.service.bd.tools.repo;
 
 import cn.reghao.autodop.common.utils.text.TextFile;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;
 import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
 import cn.reghao.autodop.dmaster.app.entity.log.ChangedFile;
-import cn.reghao.autodop.dmaster.app.exception.UpdateException;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
@@ -98,7 +97,7 @@ public class GitImpl implements CodeUpdater {
         String localRepoDir = local + dirname(remote);
         File file = new File(localRepoDir);
         if (!file.exists() && !file.mkdirs()) {
-            throw new UpdateException("创建 " + localRepoDir + " 目录失败...");
+            throw new Exception("创建 " + localRepoDir + " 目录失败...");
         }
 
         File localRepo = new File(localRepoDir + "/.git");

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.build.tools.repo;
+package cn.reghao.autodop.dmaster.app.service.bd.tools.repo;
 
 import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
 import cn.reghao.autodop.dmaster.app.entity.log.ChangedFile;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/app/AppCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/AppOrchestrationService.java

@@ -1,13 +1,12 @@
-package cn.reghao.autodop.dmaster.app.service.config.app;
+package cn.reghao.autodop.dmaster.app.service.crud;
 
 import cn.reghao.autodop.dmaster.app.constant.AppType;
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import cn.reghao.autodop.dmaster.app.entity.status.BuildDeployApp;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.repository.config.AppConfigRepository;
-import cn.reghao.autodop.dmaster.app.service.config.BuildDeployAppCrudService;
-import cn.reghao.autodop.dmaster.app.service.config.SharedEntityChecker;
+import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.service.BuildDeployAppCrudService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -24,27 +23,26 @@ import java.util.List;
  */
 //@CacheConfig(cacheNames = {"appCache"})
 @Service
-public class AppCrudService implements CrudOps<AppOrchestration> {
-    private AppConfigRepository appRepository;
+public class AppOrchestrationService implements CrudOps<AppOrchestration> {
+    private AppOrchestrationRepository appRepository;
     private SharedEntityChecker sharedEntityChecker;
     private BuildDeployAppCrudService buildDeployAppCrudService;
 
-    public AppCrudService(AppConfigRepository appRepository,
-                          SharedEntityChecker sharedEntityChecker,
-                          BuildDeployAppCrudService buildDeployAppCrudService) {
+    public AppOrchestrationService(AppOrchestrationRepository appRepository,
+                                   SharedEntityChecker sharedEntityChecker,
+                                   BuildDeployAppCrudService buildDeployAppCrudService) {
         this.appRepository = appRepository;
         this.sharedEntityChecker = sharedEntityChecker;
         this.buildDeployAppCrudService = buildDeployAppCrudService;
     }
 
-    @Override
     public void add(AppOrchestration app) throws Exception {
         checkSharedEntity(app);
         AppOrchestration appEntity = appRepository.findByIsDeleteFalseAndAppId(app.getAppId());
         if (appEntity == null) {
             app.setIsDelete(false);
             appRepository.save(app);
-            buildDeployAppCrudService.add(BuildDeployApp.of(app));
+            buildDeployAppCrudService.insert(BuildDeployApp.of(app));
         }
     }
 
@@ -72,7 +70,7 @@ public class AppCrudService implements CrudOps<AppOrchestration> {
     }
 
     @Override
-    public void addOrUpdate(AppOrchestration app) throws Exception {
+    public void insert(AppOrchestration app) throws Exception {
         if (app.getProj() != null) {
             sharedEntityChecker.checkAndSetProj(app);
         } else {
@@ -88,7 +86,7 @@ public class AppCrudService implements CrudOps<AppOrchestration> {
         }
         app.setIsDelete(false);
         appRepository.save(app);
-        buildDeployAppCrudService.addOrUpdate(BuildDeployApp.of(app));
+        buildDeployAppCrudService.insert(BuildDeployApp.of(app));
     }
 
     public void copy(String from, String to) throws Exception {
@@ -102,7 +100,7 @@ public class AppCrudService implements CrudOps<AppOrchestration> {
             toApp = (AppOrchestration) fromApp.clone();
             copyToDifferentBranch(toApp, to);
             appRepository.save(toApp);
-            buildDeployAppCrudService.addOrUpdate(BuildDeployApp.of(toApp));
+            buildDeployAppCrudService.insert(BuildDeployApp.of(toApp));
         }
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/build/BuildDirService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/BuildDirService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.build;
+package cn.reghao.autodop.dmaster.app.service.crud;
 
 import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
 import cn.reghao.autodop.dmaster.app.repository.config.build.BuildDirRepository;
@@ -22,7 +22,11 @@ public class BuildDirService implements CrudOps<BuildDir> {
     }
 
     @Override
-    public PageList<BuildDir> getByPage(int page, int size) {
+    public void insert(BuildDir buildDir) {
+    }
+
+    @Override
+    public PageList<BuildDir> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/build/CompilerConfigService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/CompilerConfigService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.build;
+package cn.reghao.autodop.dmaster.app.service.crud;
 
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;
@@ -10,7 +10,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao
@@ -25,7 +24,7 @@ public class CompilerConfigService implements CrudOps<CompilerConfig> {
     }
 
     @Override
-    public void addOrUpdate(CompilerConfig appCompile) throws Exception {
+    public void insert(CompilerConfig appCompile) throws Exception {
         // TODO 检测本机上是否存在编译器
         //checkScript(script);
 
@@ -50,7 +49,7 @@ public class CompilerConfigService implements CrudOps<CompilerConfig> {
     }
 
     @Override
-    public PageList<CompilerConfig> getByPage(int page, int size) {
+    public PageList<CompilerConfig> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/build/PackerConfigService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/PackerConfigService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.build;
+package cn.reghao.autodop.dmaster.app.service.crud;
 
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;
@@ -11,7 +11,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao
@@ -26,7 +25,7 @@ public class PackerConfigService implements CrudOps<PackerConfig> {
     }
 
     @Override
-    public void addOrUpdate(PackerConfig packerConfig) throws Exception {
+    public void insert(PackerConfig packerConfig) throws Exception {
         if (PackerType.valueOf(packerConfig.getType()) == PackerType.docker) {
             // TODO 检测本机上是否存在 docker
             // checkScript("docker -v");
@@ -53,7 +52,7 @@ public class PackerConfigService implements CrudOps<PackerConfig> {
     }
 
     @Override
-    public PageList<PackerConfig> getByPage(int page, int size) {
+    public PageList<PackerConfig> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/app/ProjCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/ProjOrchestrationService.java

@@ -1,10 +1,9 @@
-package cn.reghao.autodop.dmaster.app.service.config.app;
+package cn.reghao.autodop.dmaster.app.service.crud;
 
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.repository.config.ProjConfigRepository;
-import cn.reghao.autodop.dmaster.app.service.config.SharedEntityChecker;
+import cn.reghao.autodop.dmaster.app.repository.config.ProjOrchestrationRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -17,18 +16,18 @@ import java.time.LocalDateTime;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class ProjCrudService implements CrudOps<ProjOrchestration> {
-    private ProjConfigRepository projRepository;
+public class ProjOrchestrationService implements CrudOps<ProjOrchestration> {
+    private ProjOrchestrationRepository projRepository;
     private SharedEntityChecker sharedEntityChecker;
 
-    public ProjCrudService(ProjConfigRepository projRepository,
-                           SharedEntityChecker sharedEntityChecker) {
+    public ProjOrchestrationService(ProjOrchestrationRepository projRepository,
+                                    SharedEntityChecker sharedEntityChecker) {
         this.projRepository = projRepository;
         this.sharedEntityChecker = sharedEntityChecker;
     }
 
     @Override
-    public void addOrUpdate(ProjOrchestration proj) throws Exception {
+    public void insert(ProjOrchestration proj) throws Exception {
         sharedEntityChecker.checkAndSetBuildConfig(proj.getBuildConfig());
         ProjOrchestration projEntity = projRepository.findByIsDeleteFalseAndProjId(proj.getProjId());
         if (projEntity != null) {

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/build/RepoAuthConfigService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/RepoAuthConfigService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.build;
+package cn.reghao.autodop.dmaster.app.service.crud;
 
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;
@@ -24,7 +24,7 @@ public class RepoAuthConfigService implements CrudOps<RepoAuthConfig> {
     }
 
     @Override
-    public void addOrUpdate(RepoAuthConfig repoAuthConfig) throws Exception {
+    public void insert(RepoAuthConfig repoAuthConfig) throws Exception {
         RepoAuthConfig repoAuthConfigEntity = repoAuthRepository.findByIsDeleteFalseAndName(repoAuthConfig.getName());
         if (repoAuthConfigEntity != null) {
             repoAuthConfig.setId(repoAuthConfigEntity.getId());
@@ -46,7 +46,7 @@ public class RepoAuthConfigService implements CrudOps<RepoAuthConfig> {
     }
 
     @Override
-    public PageList<RepoAuthConfig> getByPage(int page, int size) {
+    public PageList<RepoAuthConfig> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/SharedEntityChecker.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/SharedEntityChecker.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config;
+package cn.reghao.autodop.dmaster.app.service.crud;
 
 import cn.reghao.autodop.dmaster.app.entity.config.build.BuildConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
@@ -9,7 +9,7 @@ import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
 import cn.reghao.autodop.dmaster.app.repository.config.build.CompilerConfigRepository;
 import cn.reghao.autodop.dmaster.app.repository.config.build.PackerConfigRepository;
 import cn.reghao.autodop.dmaster.app.repository.config.build.RepoAuthConfigRepository;
-import cn.reghao.autodop.dmaster.app.repository.config.ProjConfigRepository;
+import cn.reghao.autodop.dmaster.app.repository.config.ProjOrchestrationRepository;
 import cn.reghao.autodop.dmaster.auth.entity.Role;
 import cn.reghao.autodop.dmaster.auth.repository.RoleRepository;
 import org.springframework.stereotype.Service;
@@ -22,13 +22,13 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SharedEntityChecker {
-    private ProjConfigRepository projRepository;
+    private ProjOrchestrationRepository projRepository;
     private RepoAuthConfigRepository repoAuthConfigRepository;
     private CompilerConfigRepository compilerConfigRepository;
     private PackerConfigRepository packerConfigRepository;
     private RoleRepository roleRepository;
 
-    public SharedEntityChecker(ProjConfigRepository projRepository,
+    public SharedEntityChecker(ProjOrchestrationRepository projRepository,
                                RepoAuthConfigRepository repoAuthConfigRepository,
                                CompilerConfigRepository compilerConfigRepository,
                                PackerConfigRepository packerConfigRepository,

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/log/AppStatusCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/log/AppStatusCrudService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.log;
+package cn.reghao.autodop.dmaster.app.service.log;
 
 import cn.reghao.autodop.common.dagent.app.api.data.DeployedAppStatus;
 import cn.reghao.autodop.dmaster.app.repository.status.AppStatusRepository;
@@ -25,7 +25,7 @@ public class AppStatusCrudService implements CrudOps<DeployedAppStatus> {
     }
 
     @Override
-    public void addOrUpdate(DeployedAppStatus deployedAppStatus) throws Exception {
+    public void insert(DeployedAppStatus deployedAppStatus) throws Exception {
         String appId = deployedAppStatus.getAppId();
         String commitId = deployedAppStatus.getCommitId();
         String machineId = deployedAppStatus.getMachineId();

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/log/BuildDeployLogService.java

@@ -3,11 +3,7 @@ package cn.reghao.autodop.dmaster.app.service.log;
 import cn.reghao.autodop.common.dagent.app.api.data.DeployedAppStatus;
 import cn.reghao.autodop.dmaster.app.entity.log.*;
 import cn.reghao.autodop.dmaster.app.entity.status.BuildDeployApp;
-import cn.reghao.autodop.dmaster.app.service.config.log.AppStatusCrudService;
-import cn.reghao.autodop.dmaster.app.service.config.BuildDeployAppCrudService;
-import cn.reghao.autodop.dmaster.app.service.config.log.BuildLogCrudService;
-import cn.reghao.autodop.dmaster.app.service.config.log.CommitLogCrudService;
-import cn.reghao.autodop.dmaster.app.service.config.log.DeployLogCrudService;
+import cn.reghao.autodop.dmaster.app.service.BuildDeployAppCrudService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,26 +37,26 @@ public class BuildDeployLogService {
 
     @Transactional(rollbackFor = {Exception.class})
     public void saveCommitLog(CommitLog commitLog) {
-        commitLogCrudService.add(commitLog);
+        commitLogCrudService.insert(commitLog);
     }
 
     @Transactional(rollbackFor = {Exception.class})
     public void saveBuildLog(BuildLog buildLog) throws Exception {
-        buildLogCrudService.add(buildLog);
+        buildLogCrudService.insert(buildLog);
     }
 
     @Transactional(rollbackFor = {Exception.class})
     public void saveDeployLog(DeployLog deployLog) throws Exception {
-        deployLogCrudService.add(deployLog);
+        deployLogCrudService.insert(deployLog);
     }
 
     @Transactional(rollbackFor = {Exception.class})
     public void saveBuildDeployApp(BuildDeployApp buildDeployApp) throws Exception {
-        buildDeployAppCrudService.addOrUpdate(buildDeployApp);
+        buildDeployAppCrudService.insert(buildDeployApp);
     }
 
     @Transactional(rollbackFor = {Exception.class})
     public void saveAppStatus(DeployedAppStatus deployedAppStatus) throws Exception {
-        statusCrudService.addOrUpdate(deployedAppStatus);
+        statusCrudService.insert(deployedAppStatus);
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/log/BuildLogCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/log/BuildLogCrudService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.log;
+package cn.reghao.autodop.dmaster.app.service.log;
 
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.repository.log.BuildLogRepository;
@@ -24,7 +24,7 @@ public class BuildLogCrudService implements CrudOps<BuildLog> {
     }
 
     @Override
-    public void add(BuildLog buildLog) {
+    public void insert(BuildLog buildLog) {
         BuildLog entity =
                 buildLogRepository.findByAppIdAndRepoAndCompilerAndPackerAndPackScriptAndCommitIdAndStatusCode(
                 buildLog.getAppId(), buildLog.getRepo(), buildLog.getCompiler(), buildLog.getPacker(),

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/log/CommitLogCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/log/CommitLogCrudService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.log;
+package cn.reghao.autodop.dmaster.app.service.log;
 
 import cn.reghao.autodop.dmaster.app.entity.log.CommitLog;
 import cn.reghao.autodop.dmaster.app.repository.log.CommitLogRepository;
@@ -24,7 +24,7 @@ public class CommitLogCrudService implements CrudOps<CommitLog> {
     }
 
     @Override
-    public void add(CommitLog commitLog) {
+    public void insert(CommitLog commitLog) {
         CommitLog entity = commitLogRepository.findByAppIdAndRepoAndCommitId(
                 commitLog.getAppId(), commitLog.getRepo(), commitLog.getCommitId());
         if (entity == null) {

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/config/log/DeployLogCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/log/DeployLogCrudService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.service.config.log;
+package cn.reghao.autodop.dmaster.app.service.log;
 
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;
@@ -25,7 +25,7 @@ public class DeployLogCrudService implements CrudOps<DeployLog> {
     }
 
     @Override
-    public void add(DeployLog deployLog) {
+    public void insert(DeployLog deployLog) {
         String machineId = deployLog.getMachineId();
         BuildLog buildLog = deployLog.getBuildLog();
         DeployLog entity = deployLogRepository.findByBuildLogAndMachineId(buildLog, machineId);

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/controller/App3CrudController.java

@@ -28,9 +28,9 @@ public class App3CrudController {
 
     @PostMapping
     public String addApp3(@RequestBody String jsonData) {
-        App3 app3 = (App3) JsonConverter.jsonToObject(jsonData, App3.class);
+        App3 app3 = JsonConverter.jsonToObject(jsonData, App3.class);
         if (isApp3Valid(app3)) {
-            app3CrudService.addOrUpdate(app3);
+            app3CrudService.insert(app3);
             return WebResult.success("add done...");
         }
 
@@ -43,15 +43,15 @@ public class App3CrudController {
             return WebResult.fail("get failed...");
         }
 
-        PageList<App3> list = app3CrudService.getByPage(page, size);
+        PageList<App3> list = app3CrudService.getByPage(page, size, "");
         return WebResult.success(list);
     }
 
     @PutMapping
     public String modifyApp3(@RequestBody String jsonData) {
-        App3 app3 = (App3) JsonConverter.jsonToObject(jsonData, App3.class);
+        App3 app3 = JsonConverter.jsonToObject(jsonData, App3.class);
         if (isApp3Valid(app3)) {
-            app3CrudService.addOrUpdate(app3);
+            app3CrudService.insert(app3);
             return WebResult.success("put done...");
         }
 
@@ -70,9 +70,9 @@ public class App3CrudController {
 
     @PostMapping("/bak")
     public String addApp3Bak(@RequestBody String jsonData) throws Exception {
-        App3Bak app3Bak = (App3Bak) JsonConverter.jsonToObject(jsonData, App3Bak.class);
+        App3Bak app3Bak = JsonConverter.jsonToObject(jsonData, App3Bak.class);
         if (isApp3BakValid(app3Bak)) {
-            app3BakCrudService.addOrUpdate(app3Bak);
+            app3BakCrudService.insert(app3Bak);
             return WebResult.success("add done...");
         }
 
@@ -85,15 +85,15 @@ public class App3CrudController {
             return WebResult.fail("get failed...");
         }
 
-        PageList<App3Bak> list = app3BakCrudService.getByPage(page, size);
+        PageList<App3Bak> list = app3BakCrudService.getByPage(page, size, "");
         return WebResult.success(list);
     }
 
     @PutMapping("/bak")
     public String modifyApp3Bak(@RequestBody String jsonData) throws Exception {
-        App3Bak app3Bak = (App3Bak) JsonConverter.jsonToObject(jsonData, App3Bak.class);
+        App3Bak app3Bak = JsonConverter.jsonToObject(jsonData, App3Bak.class);
         if (isApp3BakValid(app3Bak)) {
-            app3BakCrudService.addOrUpdate(app3Bak);
+            app3BakCrudService.insert(app3Bak);
             return WebResult.success("put done...");
         }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/scheduler/ScriptBakJob.java

@@ -48,7 +48,7 @@ public class ScriptBakJob implements Job {
                 app3BakLog.setSuccess(false);
                 app3BakLog.setResult(shellResult.getStderr());
             }
-            mongoCrud.addOrUpdate(app3BakLog);
+            mongoCrud.insert(app3BakLog);
         } catch (Exception e) {
             app3BakLog.setSuccess(false);
             app3BakLog.setResult(e.getMessage());

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/service/crud/App3BakCrudService.java

@@ -28,7 +28,7 @@ public class App3BakCrudService implements CrudOps<App3Bak> {
     }
 
     @Override
-    public void addOrUpdate(App3Bak app3Bak) throws Exception {
+    public void insert(App3Bak app3Bak) throws Exception {
         String app3Name = app3Bak.getApp3Name();
         App3 app3 = app3Repository.findByIsDeleteFalseAndApp3Name(app3Name);
         if (app3 == null) {
@@ -48,7 +48,7 @@ public class App3BakCrudService implements CrudOps<App3Bak> {
     }
 
     @Override
-    public PageList<App3Bak> getByPage(int page, int size) {
+    public PageList<App3Bak> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/service/crud/App3BakLogCrudService.java

@@ -22,12 +22,12 @@ public class App3BakLogCrudService implements CrudOps<App3BakLog> {
     }
 
     @Override
-    public void addOrUpdate(App3BakLog app3BakLog) {
+    public void insert(App3BakLog app3BakLog) {
         app3BakLogRepository.save(app3BakLog);
     }
 
     @Override
-    public PageList<App3BakLog> getByPage(int page, int size) {
+    public PageList<App3BakLog> getByPage(int page, int size, String uk) {
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));
         Page<App3BakLog> app3BakLogPage = app3BakLogRepository.findAll(pageRequest);

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/service/crud/App3CrudService.java

@@ -24,7 +24,7 @@ public class App3CrudService implements CrudOps<App3> {
     }
 
     @Override
-    public void addOrUpdate(App3 app3) {
+    public void insert(App3 app3) {
         App3 app3Entity = app3Repository.findByIsDeleteFalseAndApp3Name(app3.getApp3Name());
         if (app3Entity != null) {
             // 若是新增，这三项值数据库会自动生成
@@ -38,7 +38,7 @@ public class App3CrudService implements CrudOps<App3> {
     }
 
     @Override
-    public PageList<App3> getByPage(int page, int size) {
+    public PageList<App3> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));

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

@@ -37,12 +37,17 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         // TODO 具体的权限验证在 JwtTokenFilter 中完成
         http.authorizeRequests()
                 .expressionHandler(webExpressionHandler())
-                // TODO 放行所有接口(测试时使用)
+                // 放行 swagger
+                .antMatchers("/swagger-ui.html").permitAll()
+                .antMatchers("/webjars/**").permitAll()
+                .antMatchers("/v2/**").permitAll()
+                .antMatchers("/swagger-resources/**").permitAll()
                 .antMatchers("/**").permitAll()
-                /*.antMatchers("/api/monitor/**").permitAll()
+                // TODO 放行测试接口
+                .antMatchers("/api/monitor/**").permitAll()
                 .antMatchers("/api/vm/**").permitAll()
                 .antMatchers("/logout").permitAll()
-                .antMatchers("/actuator/health").permitAll()*/
+                .antMatchers("/actuator/health").permitAll()
                 .anyRequest().authenticated();
 
         // 异常处理

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

@@ -27,7 +27,7 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping(value = "/{type}", consumes = "application/json")
     public ResponseEntity<String> add(@PathVariable("type") int type, @RequestBody String json) throws Exception {
-        userService.addOrUpdate(type, json);
+        userService.insert(type, json);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 
@@ -44,7 +44,7 @@ public class UserController {
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PutMapping("/{type}")
     public ResponseEntity<String> modify(@PathVariable("type") int type, @RequestBody String json) throws Exception {
-        userService.addOrUpdate(type, json);
+        userService.insert(type, json);
         return ResponseEntity.ok().body(WebResult.success("ok"));
     }
 

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

@@ -43,10 +43,10 @@ public class UserService {
         this.permissionRepository = permissionRepository;
     }
 
-    public void addOrUpdate(int type, String json) throws Exception {
+    public void insert(int type, String json) throws Exception {
         switch (type) {
             case 1:
-                Role role = (Role) JsonConverter.jsonToObject(json, Role.class);
+                Role role = JsonConverter.jsonToObject(json, Role.class);
                 String name = rolePrefix + role.getName().toUpperCase();
                 role.setName(name);
                 Role roleEntity = roleRepository.findRoleByName(role.getName());
@@ -59,7 +59,7 @@ public class UserService {
                 }
                 break;
             case 2:
-                Permission permission = (Permission) JsonConverter.jsonToObject(json, Permission.class);
+                Permission permission = JsonConverter.jsonToObject(json, Permission.class);
                 Role role1 = permission.getRole();
                 Role roleEntity1 = roleRepository.findRoleByName(rolePrefix + role1.getName());
                 if (roleEntity1 != null) {
@@ -78,7 +78,7 @@ public class UserService {
                 }
                 break;
             case 3:
-                UserAuthVO vo = (UserAuthVO) JsonConverter.jsonToObject(json, UserAuthVO.class);
+                UserAuthVO vo = JsonConverter.jsonToObject(json, UserAuthVO.class);
                 UserAuth userAuth = UserAuthVO.to(vo);
                 Set<GrantedAuthorityImpl> authorities = userAuth.authorities();
                 Set<GrantedAuthorityImpl> authoritiesEntity = new HashSet<>();

dmaster/src/main/java/cn/reghao/autodop/dmaster/common/db/CrudOps.java

@@ -1,7 +1,6 @@
 package cn.reghao.autodop.dmaster.common.db;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 数据 CRUD 操作接口
@@ -10,36 +9,20 @@ import java.util.Set;
  * @date 2020-06-25 01:34:27
  */
 public interface CrudOps<T> {
-    default void add(T t) throws Exception {
-    }
-
-    default void batchAdd(List<T> list) {
-    }
+    void insert(T t) throws Exception;
 
-    default void addOrUpdate(T t) throws Exception {
+    default void batchInsert(List<T> list) {
     }
 
     default void update(T t) throws Exception {
     }
 
-    default void batchUpdate(List<T> t) throws Exception {
-    }
-
     default void delete(String uniqueKey) throws Exception {
-
     }
 
-    default void batchDelete(Set<String> uniqueKeys) {
-    }
-
-    default PageList<T> getByPage(int page, int size) {
-        return null;
-    }
-
-    default PageList<T> getByPage(int page, int size, String field) {
+    default T get(String uniqueKey) {
         return null;
     }
 
-    default void get(String uniqueKey) {
-    }
+    PageList<T> getByPage(int page, int size, String field);
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/common/db/mongo/MongoCrud.java

@@ -23,26 +23,14 @@ public class MongoCrud<T> implements CrudOps<T> {
     }
 
     @Override
-    public void addOrUpdate(T t) {
+    public void insert(T t) {
     }
 
     @Override
-    public PageList<T> getByPage(int page, int size) {
+    public PageList<T> getByPage(int page, int size, String uk) {
         return null;
     }
 
-    @Override
-    public void get(String uniqueKey) {
-    }
-
-    @Override
-    public void delete(String uniqueKey) throws Exception {
-    }
-
-    public void insert(Object object) {
-        mongoTemplate.save(object);
-    }
-
     public List<App3BakLog> query(String serviceName) {
         Query query = Query.query(Criteria.where("service_name").is(serviceName));
         return mongoTemplate.find(query, App3BakLog.class);

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/controller/crud/MachineCrudController.java

@@ -33,7 +33,7 @@ public class MachineCrudController {
 
     @GetMapping("/list")
     public String machineIdByPage(@RequestParam("page") int page, @RequestParam("size") int size) {
-        PageList<MachineInfo> pageList = machineCrudService.getByPage(page, size);
+        PageList<MachineInfo> pageList = machineCrudService.getByPage(page, size, "");
 
         Map<String, String> map = machineDispatcher.getMachineStatus();
         PageList<MachineInfoVO> vos = new PageList<>();

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/crud/MachineCrudService.java

@@ -24,7 +24,7 @@ public class MachineCrudService implements CrudOps<MachineInfo> {
     }
 
     @Override
-    public void addOrUpdate(MachineInfo machineInfo) throws Exception {
+    public void insert(MachineInfo machineInfo) throws Exception {
         // 重复 machineId 则更新
         MachineInfo machineEntity = machineRepository.findByMachineId(machineInfo.getMachineId());
         if (machineEntity != null) {
@@ -36,7 +36,7 @@ public class MachineCrudService implements CrudOps<MachineInfo> {
     }
 
     @Override
-    public PageList<MachineInfo> getByPage(int page, int size) {
+    public PageList<MachineInfo> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/crud/MachineLogCrudService.java

@@ -4,6 +4,7 @@ import cn.reghao.autodop.dmaster.machine.entity.MachineLog;
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import cn.reghao.autodop.dmaster.machine.repository.MachineLogRepository;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
@@ -21,26 +22,21 @@ public class MachineLogCrudService implements CrudOps<MachineLog> {
     }
 
     @Override
-    public void addOrUpdate(MachineLog machineLog) throws Exception {
+    public void insert(MachineLog machineLog) throws Exception {
         machineLogRepository.save(machineLog);
     }
 
     @Override
-    public PageList<MachineLog> getByPage(int page, int size) {
+    public PageList<MachineLog> getByPage(int page, int size, String uk) {
         // 默认按更新时间倒序
         PageRequest pageRequest =
                 PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "updateTime"));
 
-        /*Page<MachineLog> page1 = machineLogRepository.findByIsDeleteFalse(pageRequest);
+        //Page<MachineLog> page1 = machineLogRepository.findByIsDeleteFalse(pageRequest);
         PageList<MachineLog> pageList = new PageList<>();
-        pageList.setTotalSize(page1.getTotalElements());
+        /*pageList.setTotalSize(page1.getTotalElements());
         pageList.setTotalPages(page1.getTotalPages());
-        pageList.setList(page1.getContent());
-        return pageList;*/
-        return null;
-    }
-
-    @Override
-    public void delete(String uniqueKey) throws Exception {
+        pageList.setList(page1.getContent());*/
+        return pageList;
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/MonitorScheduler.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.monitor;
 
 import cn.reghao.autodop.dmaster.app.constant.EnvType;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.service.config.app.AppCrudService;
+import cn.reghao.autodop.dmaster.app.service.crud.AppOrchestrationService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
@@ -20,15 +20,15 @@ import java.util.List;
 @Component
 public class MonitorScheduler {
     private Scheduler scheduler;
-    private AppCrudService appCrudService;
+    private AppOrchestrationService appOrchestrationService;
 
-    public MonitorScheduler(AppCrudService appCrudService) throws SchedulerException {
+    public MonitorScheduler(AppOrchestrationService appOrchestrationService) throws SchedulerException {
         this.scheduler = StdSchedulerFactory.getDefaultScheduler();
-        this.appCrudService = appCrudService;
+        this.appOrchestrationService = appOrchestrationService;
     }
 
     public void add(Class<? extends Job> clazz, String jobId, String cronExp) throws SchedulerException {
-        List<AppOrchestration> list = appCrudService.find(EnvType.prod.name());
+        List<AppOrchestration> list = appOrchestrationService.find(EnvType.prod.name());
         JobDataMap jobDataMap = new JobDataMap();
         jobDataMap.put("appConfigs", list);
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/amqp/DmasterConsumer.java

@@ -34,7 +34,7 @@ public class DmasterConsumer {
     )
     public void dmasterQueueConsumer(@Payload String msg) {
         try {
-            MqMessage mqMessage = (MqMessage) JsonConverter.jsonToObject(msg, MqMessage.class);
+            MqMessage mqMessage = JsonConverter.jsonToObject(msg, MqMessage.class);
             String machineId = mqMessage.getMachineId();
             long sendTime = mqMessage.getSendTime();
             boolean isRpc = mqMessage.isRpc();

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/amqp/MachineDispatcher.java

@@ -36,19 +36,19 @@ public class MachineDispatcher {
             switch (MachineOps.valueOf(ops)) {
                 case machineRegistryOps:
                     log.info("机器注册消息...");
-                    MachineInfo machineInfo = (MachineInfo) JsonConverter.jsonToObject(payload, MachineInfo.class);
-                    machineCrudService.addOrUpdate(machineInfo);
+                    MachineInfo machineInfo = JsonConverter.jsonToObject(payload, MachineInfo.class);
+                    machineCrudService.insert(machineInfo);
                     break;
                 case machineHeartbeatOps:
                     // TODO 做一些逻辑处理，判断内存和磁盘的使用量，然后存入数据库，更新数据
                     // TODO 存到 MongoDB
-                    MachineHeartbeat machineHeartbeat = (MachineHeartbeat) JsonConverter.jsonToObject(payload, MachineHeartbeat.class);
+                    MachineHeartbeat machineHeartbeat = JsonConverter.jsonToObject(payload, MachineHeartbeat.class);
                     setMachineStatus(machineHeartbeat);
                     //log.info("来自机器的心跳...");
                     break;
                 case machineLogOps:
-                    MachineLog machineLog = (MachineLog) JsonConverter.jsonToObject(payload, MachineLog.class);
-                    //machineLogCrudService.addOrUpdate(machineLog);
+                    MachineLog machineLog = JsonConverter.jsonToObject(payload, MachineLog.class);
+                    //machineLogCrudService.insert(machineLog);
                     break;
                 default:
                     //log.info("来自机器的消息...");

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/notifier/NotifyService.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.utils.notifier;
 
 import cn.reghao.autodop.dmaster.app.constant.NotifyType;
 import cn.reghao.autodop.dmaster.app.entity.config.NotifyReceiver;
-import cn.reghao.autodop.dmaster.app.service.deploy.DeployNotifyMsg;
+import cn.reghao.autodop.dmaster.app.service.bd.DeployNotifyMsg;
 import cn.reghao.autodop.dmaster.common.thread.ThreadPoolWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

dmaster/src/test/java/cn/reghao/autodop/common/amqp/RabbitProducerTest.java

@@ -65,7 +65,7 @@ class RabbitProducerTest {
         mqMessage.setPayload(JsonConverter.objectToJson(machineShellArgs));
 
         RpcResult rpcResult = rabbitProducer.callRemote(exchange, routeKey, mqMessage);
-        MachineShell machineShell = (MachineShell) JsonConverter.jsonToObject(rpcResult.getResult(), MachineShell.class);
+        MachineShell machineShell = JsonConverter.jsonToObject(rpcResult.getResult(), MachineShell.class);
         System.out.println(rpcResult.getResult());
     }
 }

dmaster/src/test/java/cn/reghao/autodop/dmaster/app/service/RefreshServiceTest.java

@@ -7,7 +7,7 @@ import cn.reghao.autodop.dmaster.DmasterApplication;
 import cn.reghao.autodop.dmaster.app.constant.EnvType;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.RunningConfig;
-import cn.reghao.autodop.dmaster.app.service.config.app.AppCrudService;
+import cn.reghao.autodop.dmaster.app.service.crud.AppOrchestrationService;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -29,14 +29,14 @@ class RefreshServiceTest {
     @Autowired
     private RefreshService refreshService;
     @Autowired
-    private AppCrudService appCrudService;
+    private AppOrchestrationService appOrchestrationService;
 
     @Test
     void refreshBuildList() {
         WebRequest webRequest = new DefaultWebRequest();
 
         //refreshService.refreshBuildList("test");
-        List<AppOrchestration> list = appCrudService.find(EnvType.prod.name());
+        List<AppOrchestration> list = appOrchestrationService.find(EnvType.prod.name());
         List<HealthCheck> healthChecks = new ArrayList<>();
         list.forEach(appConfig -> {
             RunningConfig runningConfig = appConfig.getRunningConfig();