优化 app 模块的代码结构

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/BuildDirController.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.controller.config;
 
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
-import cn.reghao.autodop.dmaster.app.db.crud.config.BuildDirCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.BuildDirCrud;
 import cn.reghao.jdkutil.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,16 +21,16 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/api/app/config/build/dir")
 public class BuildDirController {
-    private BuildDirCrudService buildDirCrudService;
+    private BuildDirCrud buildDirCrud;
 
-    public BuildDirController(BuildDirCrudService buildDirCrudService) {
-        this.buildDirCrudService = buildDirCrudService;
+    public BuildDirController(BuildDirCrud buildDirCrud) {
+        this.buildDirCrud = buildDirCrud;
     }
 
     @ApiOperation(value = "迁移构建目录")
     @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> modifyBuildDir(@Validated BuildDir buildDir) {
-        Result result = buildDirCrudService.update(buildDir);
+        Result result = buildDirCrud.update(buildDir);
         return ResponseEntity.ok().body(WebBody.result(result));
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/CompilerController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/CompilerConfigController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.dmaster.app.db.crud.config.CompilerConfigCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.CompilerConfigCrud;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.WebBody;
@@ -20,10 +20,10 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "应用编译配置接口")
 @RestController
 @RequestMapping("/api/app/config/build/compiler")
-public class CompilerController {
-    private CompilerConfigCrudService compilerCrudService;
+public class CompilerConfigController {
+    private CompilerConfigCrud compilerCrudService;
 
-    public CompilerController(CompilerConfigCrudService compilerCrudService) {
+    public CompilerConfigController(CompilerConfigCrud compilerCrudService) {
         this.compilerCrudService = compilerCrudService;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/PackerController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/PackerConfigController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.dmaster.app.db.crud.config.PackerConfigCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.PackerConfigCrud;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.WebBody;
@@ -20,10 +20,10 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "应用打包配置接口")
 @RestController
 @RequestMapping("/api/app/config/build/packer")
-public class PackerController {
-    private PackerConfigCrudService packerCrudService;
+public class PackerConfigController {
+    private PackerConfigCrud packerCrudService;
 
-    public PackerController(PackerConfigCrudService packerCrudService) {
+    public PackerConfigController(PackerConfigCrud packerCrudService) {
         this.packerCrudService = packerCrudService;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/ProjConfigController.java

@@ -1,10 +1,8 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.dmaster.app.db.crud.config.AppConfigCrud;
-import cn.reghao.autodop.dmaster.app.db.crud.config.ProjCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.ProjConfigCrud;
 import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
 import cn.reghao.autodop.dmaster.app.model.vo.NewApp;
-import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.WebBody;
 import io.swagger.annotations.Api;
@@ -15,8 +13,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @author reghao
  * @date 2019-11-27 11:29:43
@@ -26,17 +22,17 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/app/config/proj")
 public class ProjConfigController {
-    private final ProjCrudService projCrudService;
+    private final ProjConfigCrud projConfigCrud;
 
-    public ProjConfigController(ProjCrudService projCrudService) {
-        this.projCrudService = projCrudService;
+    public ProjConfigController(ProjConfigCrud projConfigCrud) {
+        this.projConfigCrud = projConfigCrud;
     }
 
     /* 项目编排 */
     @ApiOperation(value = "添加/修改项目编排")
     @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> addProjOrchestration(@Validated ProjConfig proj) {
-        Result result = projCrudService.insertOrUpdate(proj);
+        Result result = projConfigCrud.insertOrUpdate(proj);
         return ResponseEntity.ok().body(WebBody.result(result));
     }
 
@@ -44,14 +40,14 @@ public class ProjConfigController {
     @PostMapping(value = "/copy/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> copyProjOrchestration(@PathVariable("id") ProjConfig proj,
                                                         @Validated NewApp newApp) {
-        Result result = projCrudService.copy(proj, newApp);
+        Result result = projConfigCrud.copy(proj, newApp);
         return ResponseEntity.ok().body(WebBody.result(result));
     }
 
     @ApiOperation(value = "删除项目编排")
     @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> deleteProjOrchestration(@PathVariable("id") ProjConfig proj) {
-        Result result = projCrudService.delete(proj);
+        Result result = projConfigCrud.delete(proj);
         return ResponseEntity.ok().body(WebBody.result(result));
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/RepoAuthController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/RepoAuthConfigController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.dmaster.app.db.crud.config.RepoAuthConfigCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.RepoAuthConfigCrud;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.WebBody;
@@ -20,10 +20,10 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "仓库认证配置接口")
 @RestController
 @RequestMapping("/api/app/config/build/repoauth")
-public class RepoAuthController {
-    private RepoAuthConfigCrudService repoAuthCrudService;
+public class RepoAuthConfigController {
+    private RepoAuthConfigCrud repoAuthCrudService;
 
-    public RepoAuthController(RepoAuthConfigCrudService repoAuthCrudService) {
+    public RepoAuthConfigController(RepoAuthConfigCrud repoAuthCrudService) {
         this.repoAuthCrudService = repoAuthCrudService;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/AppConfigPageController.java

@@ -7,10 +7,10 @@ import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyType;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.CompilerQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.ProjConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.CompilerConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.PackerConfigQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.RepoAuthQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
@@ -39,22 +39,22 @@ import java.util.stream.Collectors;
 @Controller
 @RequestMapping("/app/config/app")
 public class AppConfigPageController {
-    private final AppQuery appQuery;
-    private final ProjQuery projQuery;
+    private final AppConfigQuery appConfigQuery;
+    private final ProjConfigQuery projConfigQuery;
     private final RepoAuthQuery repoAuthQuery;
-    private final CompilerQuery compilerQuery;
-    private final PackerQuery packerQuery;
+    private final CompilerConfigQuery compilerConfigQuery;
+    private final PackerConfigQuery packerConfigQuery;
     private final MachineHostQuery hostQuery;
     private final NotifyGroupRepository receiverRepository;
 
-    public AppConfigPageController(AppQuery appQuery, ProjQuery projQuery, RepoAuthQuery repoAuthQuery,
-                                   CompilerQuery compilerQuery, PackerQuery packerQuery, MachineHostQuery hostQuery,
+    public AppConfigPageController(AppConfigQuery appConfigQuery, ProjConfigQuery projConfigQuery, RepoAuthQuery repoAuthQuery,
+                                   CompilerConfigQuery compilerConfigQuery, PackerConfigQuery packerConfigQuery, MachineHostQuery hostQuery,
                                    NotifyGroupRepository receiverRepository) {
-        this.appQuery = appQuery;
-        this.projQuery = projQuery;
+        this.appConfigQuery = appConfigQuery;
+        this.projConfigQuery = projConfigQuery;
         this.repoAuthQuery = repoAuthQuery;
-        this.compilerQuery = compilerQuery;
-        this.packerQuery = packerQuery;
+        this.compilerConfigQuery = compilerConfigQuery;
+        this.packerConfigQuery = packerConfigQuery;
         this.hostQuery = hostQuery;
         this.receiverRepository = receiverRepository;
     }
@@ -70,7 +70,7 @@ public class AppConfigPageController {
         if (appName != null) {
             Map<String, String> map = new HashMap<>();
             map.put("appName", appName);
-            List<AppConfig> list = appQuery.query(map);
+            List<AppConfig> list = appConfigQuery.query(map);
             Page<AppConfig> page = new PageImpl<>(list);
             PageList<AppConfig> pageList = PageList.pageList(page);
 
@@ -81,7 +81,7 @@ public class AppConfigPageController {
         }
 
         PageRequest pageRequest = PageSort.pageRequest();
-        Page<AppConfig> appPage = appQuery.findByEnv(env, pageRequest);
+        Page<AppConfig> appPage = appConfigQuery.findByEnv(env, pageRequest);
         PageList<AppConfig> pageList = PageList.pageList(appPage);
 
         model.addAttribute("env", env);
@@ -103,7 +103,7 @@ public class AppConfigPageController {
             notifyTypes.add(new KeyValue(notifyType.name(), notifyType.name()));
         }
 
-        List<KeyValue> projList = projQuery.queryAll(new HashMap<>()).stream()
+        List<KeyValue> projList = projConfigQuery.queryAll(new HashMap<>()).stream()
                 .map(proj -> new KeyValue(proj.getProjId(), proj.getProjName()))
                 .collect(Collectors.toList());
         List<KeyValue> projs = new ArrayList<>();
@@ -151,11 +151,11 @@ public class AppConfigPageController {
                 .map(repoAuthConfig -> new KeyValue(String.valueOf(repoAuthConfig.getName()), repoAuthConfig.getName()))
                 .collect(Collectors.toList());
 
-        List<KeyValue> compilers = compilerQuery.findAllByIsDeleteFalse().stream()
+        List<KeyValue> compilers = compilerConfigQuery.findAllByIsDeleteFalse().stream()
                 .map(compilerConfig -> new KeyValue(String.valueOf(compilerConfig.getName()), compilerConfig.getName()))
                 .collect(Collectors.toList());
 
-        List<KeyValue> packers = packerQuery.findAllByIsDeleteFalse().stream()
+        List<KeyValue> packers = packerConfigQuery.findAllByIsDeleteFalse().stream()
                 .map(packerConfig -> new KeyValue(String.valueOf(packerConfig.getName()), packerConfig.getName()))
                 .collect(Collectors.toList());
         model.addAttribute("repoAuths", repoAuths);
@@ -178,7 +178,7 @@ public class AppConfigPageController {
 
     @GetMapping("/detail/{appId}")
     public String appConfigPage(@PathVariable("appId") String appId, Model model) {
-        AppConfig app = appQuery.findByAppId(appId);
+        AppConfig app = appConfigQuery.findByAppId(appId);
         model.addAttribute("app", app);
         return "/app/config/app/detail";
     }

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

@@ -5,7 +5,7 @@ import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
 import cn.reghao.autodop.dmaster.app.db.query.AppBuildingQuery;
 import cn.reghao.autodop.dmaster.app.db.query.AppDeployingQuery;
 import cn.reghao.autodop.dmaster.app.db.query.AppRunningQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
@@ -38,18 +38,18 @@ import java.util.*;
 @Controller
 @RequestMapping("/app")
 public class AppPageController {
-    private AppQuery appQuery;
+    private AppConfigQuery appConfigQuery;
     private AppBuildingQuery buildingQuery;
     private AppDeployingQuery deployingQuery;
     private AppRunningQuery runningQuery;
     private BuildLogRepository buildLogRepository;
 
-    public AppPageController(AppQuery appQuery,
+    public AppPageController(AppConfigQuery appConfigQuery,
                              AppBuildingQuery buildingQuery,
                              AppDeployingQuery deployingQuery,
                              AppRunningQuery runningQuery,
                              BuildLogRepository buildLogRepository) {
-        this.appQuery = appQuery;
+        this.appConfigQuery = appConfigQuery;
         this.buildingQuery = buildingQuery;
         this.deployingQuery = deployingQuery;
         this.runningQuery = runningQuery;
@@ -114,7 +114,7 @@ public class AppPageController {
     @ApiOperation(value = "部署页面")
     @GetMapping("/deploy/{appId}")
     public String deployPage(@PathVariable("appId") String appId, Model model) {
-        AppConfig app = appQuery.findByIsDeleteFalseAndAppId(appId);
+        AppConfig app = appConfigQuery.findByIsDeleteFalseAndAppId(appId);
         List<DeployConfig> deployConfigs = app.getDeployConfigs();
         List<AppDeploying> list = new ArrayList<>();
         for (DeployConfig deployConfig : deployConfigs) {

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/CompilerPageController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.page;
 
-import cn.reghao.autodop.dmaster.app.db.query.config.CompilerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.CompilerConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.constant.build.CompileType;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
@@ -30,17 +30,17 @@ import java.util.List;
 @Controller
 @RequestMapping("/app/config/build/compiler")
 public class CompilerPageController {
-    private final CompilerQuery compilerQuery;
+    private final CompilerConfigQuery compilerConfigQuery;
 
-    public CompilerPageController(CompilerQuery compilerQuery) {
-        this.compilerQuery = compilerQuery;
+    public CompilerPageController(CompilerConfigQuery compilerConfigQuery) {
+        this.compilerConfigQuery = compilerConfigQuery;
     }
 
     @ApiOperation(value = "编译配置页面")
     @GetMapping
     public String compilerConfigPage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
-        Page<CompilerConfig> page = compilerQuery.findAll(pageRequest);
+        Page<CompilerConfig> page = compilerConfigQuery.findAll(pageRequest);
         PageList<CompilerConfig> pageList = PageList.pageList(page);
 
         model.addAttribute("page", page);

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/PackerPageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller.page;
 
 import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
-import cn.reghao.autodop.dmaster.app.db.query.config.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.PackerConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
 import cn.reghao.autodop.dmaster.util.db.PageList;
@@ -30,17 +30,17 @@ import java.util.List;
 @Controller
 @RequestMapping("/app/config/build/packer")
 public class PackerPageController {
-    private PackerQuery packerQuery;
+    private PackerConfigQuery packerConfigQuery;
 
-    public PackerPageController(PackerQuery packerQuery) {
-        this.packerQuery = packerQuery;
+    public PackerPageController(PackerConfigQuery packerConfigQuery) {
+        this.packerConfigQuery = packerConfigQuery;
     }
 
     @ApiOperation(value = "打包配置页面")
     @GetMapping
     public String packerPage(Model model) {
         PageRequest pageRequest = PageSort.pageRequest();
-        Page<PackerConfig> page = packerQuery.findAll(pageRequest);
+        Page<PackerConfig> page = packerConfigQuery.findAll(pageRequest);
         PageList<PackerConfig> pageList = PageList.pageList(page);
 
         model.addAttribute("page", page);

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/ProjConfigPageController.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.controller.page;
 
-import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.CompilerQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.ProjConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.CompilerConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.PackerConfigQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.RepoAuthQuery;
 import cn.reghao.autodop.dmaster.app.model.constant.AppType;
 import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
@@ -34,17 +34,17 @@ import java.util.stream.Collectors;
 @Controller
 @RequestMapping("/app/config/proj")
 public class ProjConfigPageController {
-    private final ProjQuery projQuery;
+    private final ProjConfigQuery projConfigQuery;
     private final RepoAuthQuery repoAuthQuery;
-    private final CompilerQuery compilerQuery;
-    private final PackerQuery packerQuery;
+    private final CompilerConfigQuery compilerConfigQuery;
+    private final PackerConfigQuery packerConfigQuery;
 
-    public ProjConfigPageController(ProjQuery projQuery, RepoAuthQuery repoAuthQuery,
-                                    CompilerQuery compilerQuery, PackerQuery packerQuery) {
-        this.projQuery = projQuery;
+    public ProjConfigPageController(ProjConfigQuery projConfigQuery, RepoAuthQuery repoAuthQuery,
+                                    CompilerConfigQuery compilerConfigQuery, PackerConfigQuery packerConfigQuery) {
+        this.projConfigQuery = projConfigQuery;
         this.repoAuthQuery = repoAuthQuery;
-        this.compilerQuery = compilerQuery;
-        this.packerQuery = packerQuery;
+        this.compilerConfigQuery = compilerConfigQuery;
+        this.packerConfigQuery = packerConfigQuery;
     }
 
     private void setCommon(Model model) {
@@ -64,11 +64,11 @@ public class ProjConfigPageController {
                 .map(repoAuthConfig -> new KeyValue(String.valueOf(repoAuthConfig.getName()), repoAuthConfig.getName()))
                 .collect(Collectors.toList());
 
-        List<KeyValue> compilers = compilerQuery.findAllByIsDeleteFalse().stream()
+        List<KeyValue> compilers = compilerConfigQuery.findAllByIsDeleteFalse().stream()
                 .map(compilerConfig -> new KeyValue(String.valueOf(compilerConfig.getName()), compilerConfig.getName()))
                 .collect(Collectors.toList());
 
-        List<KeyValue> packers = packerQuery.findAllByIsDeleteFalse().stream()
+        List<KeyValue> packers = packerConfigQuery.findAllByIsDeleteFalse().stream()
                 .map(packerConfig -> new KeyValue(String.valueOf(packerConfig.getName()), packerConfig.getName()))
                 .collect(Collectors.toList());
         model.addAttribute("repoAuths", repoAuths);
@@ -93,7 +93,7 @@ public class ProjConfigPageController {
         }*/
 
         PageRequest pageRequest = PageSort.pageRequest();
-        Page<ProjConfig> page = projQuery.findByIsDeleteFalse(pageRequest);
+        Page<ProjConfig> page = projConfigQuery.findByIsDeleteFalse(pageRequest);
         PageList<ProjConfig> pageList = PageList.pageList(page);
 
         model.addAttribute("page", page);
@@ -122,7 +122,7 @@ public class ProjConfigPageController {
 
     @GetMapping("/detail/{projId}")
     public String projConfigDetailPage(@PathVariable("projId") String projId, Model model) {
-        ProjConfig proj = projQuery.findByIsDeleteFalseAndProjId(projId);
+        ProjConfig proj = projConfigQuery.findByIsDeleteFalseAndProjId(projId);
         model.addAttribute("proj", proj);
         return "/app/config/proj/detail";
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppBuildingCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppBuildingCrud.java

@@ -9,10 +9,10 @@ import org.springframework.stereotype.Service;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class AppBuildingCrudService {
+public class AppBuildingCrud {
     private AppBuildingRepository buildingRepository;
 
-    public AppBuildingCrudService(AppBuildingRepository buildingRepository) {
+    public AppBuildingCrud(AppBuildingRepository buildingRepository) {
         this.buildingRepository = buildingRepository;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppDeployingCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppDeployingCrud.java

@@ -9,10 +9,10 @@ import org.springframework.stereotype.Service;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class AppDeployingCrudService {
+public class AppDeployingCrud {
     private AppDeployingRepository deployingRepository;
 
-    public AppDeployingCrudService(AppDeployingRepository deployingRepository) {
+    public AppDeployingCrud(AppDeployingRepository deployingRepository) {
         this.deployingRepository = deployingRepository;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppRunningCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppRunningCrud.java

@@ -9,10 +9,10 @@ import org.springframework.stereotype.Service;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class AppRunningCrudService {
+public class AppRunningCrud {
     private AppRunningRepository runningRepository;
 
-    public AppRunningCrudService(AppRunningRepository runningRepository) {
+    public AppRunningCrud(AppRunningRepository runningRepository) {
         this.runningRepository = runningRepository;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/BuildDirCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/BuildDirCrud.java

@@ -18,11 +18,11 @@ import java.util.Objects;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class BuildDirCrudService {
+public class BuildDirCrud {
     private BuildDirRepository buildDirRepository;
     private Disk disk;
 
-    public BuildDirCrudService(BuildDirRepository buildDirRepository, Disk disk) {
+    public BuildDirCrud(BuildDirRepository buildDirRepository, Disk disk) {
         this.buildDirRepository = buildDirRepository;
         this.disk = disk;
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/CompilerConfigCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/CompilerConfigCrud.java

@@ -3,8 +3,8 @@ package cn.reghao.autodop.dmaster.app.db.crud.config;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.model.constant.build.CompileType;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.ProjConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
@@ -19,15 +19,15 @@ import java.util.stream.Collectors;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class CompilerConfigCrudService {
+public class CompilerConfigCrud {
     private CompilerConfigRepository compilerRepository;
-    private AppQuery appQuery;
-    private ProjQuery projQuery;
+    private AppConfigQuery appConfigQuery;
+    private ProjConfigQuery projConfigQuery;
 
-    public CompilerConfigCrudService(CompilerConfigRepository compilerRepository, AppQuery appQuery, ProjQuery projQuery) {
+    public CompilerConfigCrud(CompilerConfigRepository compilerRepository, AppConfigQuery appConfigQuery, ProjConfigQuery projConfigQuery) {
         this.compilerRepository = compilerRepository;
-        this.appQuery = appQuery;
-        this.projQuery = projQuery;
+        this.appConfigQuery = appConfigQuery;
+        this.projConfigQuery = projConfigQuery;
     }
 
     public Result insertOrUpdate(CompilerConfig compilerConfig) {
@@ -69,8 +69,8 @@ public class CompilerConfigCrudService {
     }
 
     public Result delete(CompilerConfig compilerConfig) {
-        List<AppConfig> apps = appQuery.findAllByCompilerConfig(compilerConfig);
-        List<ProjConfig> projs = projQuery.findAllByCompilerConfig(compilerConfig);
+        List<AppConfig> apps = appConfigQuery.findAllByCompilerConfig(compilerConfig);
+        List<ProjConfig> projs = projConfigQuery.findAllByCompilerConfig(compilerConfig);
         if (apps.isEmpty() && projs.isEmpty()) {
             compilerRepository.delete(compilerConfig);
             return Result.result(ResultStatus.SUCCESS);

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/PackerConfigCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/PackerConfigCrud.java

@@ -2,8 +2,8 @@ package cn.reghao.autodop.dmaster.app.db.crud.config;
 
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.ProjConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
@@ -18,15 +18,15 @@ import java.util.stream.Collectors;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class PackerConfigCrudService {
+public class PackerConfigCrud {
     private PackerConfigRepository packerRepository;
-    private AppQuery appQuery;
-    private ProjQuery projQuery;
+    private AppConfigQuery appConfigQuery;
+    private ProjConfigQuery projConfigQuery;
 
-    public PackerConfigCrudService(PackerConfigRepository packerRepository, AppQuery appQuery, ProjQuery projQuery) {
+    public PackerConfigCrud(PackerConfigRepository packerRepository, AppConfigQuery appConfigQuery, ProjConfigQuery projConfigQuery) {
         this.packerRepository = packerRepository;
-        this.appQuery = appQuery;
-        this.projQuery = projQuery;
+        this.appConfigQuery = appConfigQuery;
+        this.projConfigQuery = projConfigQuery;
     }
 
     public Result insertOrUpdate(PackerConfig packerConfig) {
@@ -35,8 +35,8 @@ public class PackerConfigCrudService {
     }
 
     public Result delete(PackerConfig packerConfig) {
-        List<AppConfig> apps = appQuery.findAllByPackerConfig(packerConfig);
-        List<ProjConfig> projs = projQuery.findAllByPackerConfig(packerConfig);
+        List<AppConfig> apps = appConfigQuery.findAllByPackerConfig(packerConfig);
+        List<ProjConfig> projs = projConfigQuery.findAllByPackerConfig(packerConfig);
         if (apps.isEmpty() && projs.isEmpty()) {
             packerRepository.delete(packerConfig);
             return Result.result(ResultStatus.SUCCESS);

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/ProjCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/ProjConfigCrud.java

@@ -18,14 +18,14 @@ import java.util.stream.Collectors;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class ProjCrudService {
+public class ProjConfigCrud {
     private ProjConfigRepository projRepository;
     private AppConfigRepository appRepository;
     private SharedEntityChecker sharedEntityChecker;
 
-    public ProjCrudService(ProjConfigRepository projRepository,
-                           AppConfigRepository appRepository,
-                           SharedEntityChecker sharedEntityChecker) {
+    public ProjConfigCrud(ProjConfigRepository projRepository,
+                          AppConfigRepository appRepository,
+                          SharedEntityChecker sharedEntityChecker) {
         this.projRepository = projRepository;
         this.appRepository = appRepository;
         this.sharedEntityChecker = sharedEntityChecker;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/RepoAuthConfigCrudService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/RepoAuthConfigCrud.java

@@ -4,8 +4,8 @@ import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.model.constant.build.RepoAuthType;
 import cn.reghao.autodop.dmaster.app.model.constant.build.RepoType;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.ProjConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
@@ -20,15 +20,15 @@ import java.util.stream.Collectors;
  * @date 2020-11-10 21:58:00
  */
 @Service
-public class RepoAuthConfigCrudService {
+public class RepoAuthConfigCrud {
     private RepoAuthConfigRepository repoAuthRepository;
-    private AppQuery appQuery;
-    private ProjQuery projQuery;
+    private AppConfigQuery appConfigQuery;
+    private ProjConfigQuery projConfigQuery;
 
-    public RepoAuthConfigCrudService(RepoAuthConfigRepository repoAuthRepository, AppQuery appQuery, ProjQuery projQuery) {
+    public RepoAuthConfigCrud(RepoAuthConfigRepository repoAuthRepository, AppConfigQuery appConfigQuery, ProjConfigQuery projConfigQuery) {
         this.repoAuthRepository = repoAuthRepository;
-        this.appQuery = appQuery;
-        this.projQuery = projQuery;
+        this.appConfigQuery = appConfigQuery;
+        this.projConfigQuery = projConfigQuery;
     }
 
     public Result insertOrUpdate(RepoAuthConfig repoAuthConfig) {
@@ -71,8 +71,8 @@ public class RepoAuthConfigCrudService {
     }
 
     public Result delete(RepoAuthConfig repoAuthConfig) {
-        List<AppConfig> apps = appQuery.findAllByRepoAuthConfig(repoAuthConfig);
-        List<ProjConfig> projs = projQuery.findAllByRepoAuthConfig(repoAuthConfig);
+        List<AppConfig> apps = appConfigQuery.findAllByRepoAuthConfig(repoAuthConfig);
+        List<ProjConfig> projs = projConfigQuery.findAllByRepoAuthConfig(repoAuthConfig);
         if (apps.isEmpty() && projs.isEmpty()) {
             repoAuthRepository.delete(repoAuthConfig);
             return Result.result(ResultStatus.SUCCESS);

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config;
 
-import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.CompilerQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.ProjConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.CompilerConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.PackerConfigQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.RepoAuthQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
@@ -20,22 +20,22 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SharedEntityChecker {
-    private ProjQuery projQuery;
+    private ProjConfigQuery projConfigQuery;
     private RepoAuthQuery repoAuthQuery;
-    private CompilerQuery compilerQuery;
-    private PackerQuery packerQuery;
+    private CompilerConfigQuery compilerConfigQuery;
+    private PackerConfigQuery packerConfigQuery;
 
-    public SharedEntityChecker(ProjQuery projQuery, RepoAuthQuery repoAuthQuery,
-                               CompilerQuery compilerQuery, PackerQuery packerQuery) {
-        this.projQuery = projQuery;
+    public SharedEntityChecker(ProjConfigQuery projConfigQuery, RepoAuthQuery repoAuthQuery,
+                               CompilerConfigQuery compilerConfigQuery, PackerConfigQuery packerConfigQuery) {
+        this.projConfigQuery = projConfigQuery;
         this.repoAuthQuery = repoAuthQuery;
-        this.compilerQuery = compilerQuery;
-        this.packerQuery = packerQuery;
+        this.compilerConfigQuery = compilerConfigQuery;
+        this.packerConfigQuery = packerConfigQuery;
     }
 
     public void checkAndSetProj(AppConfig app) throws Exception {
         ProjConfig proj = app.getProj();
-        ProjConfig entity = projQuery.findByIsDeleteFalseAndProjId(proj.getProjId());
+        ProjConfig entity = projConfigQuery.findByIsDeleteFalseAndProjId(proj.getProjId());
         if (entity != null) {
             app.setProj(entity);
         } else {
@@ -78,7 +78,7 @@ public class SharedEntityChecker {
         }
 
         CompilerConfig compiler = buildConfig.getCompiler();
-        CompilerConfig compilerConfig = compilerQuery.findByName(compiler.getName());
+        CompilerConfig compilerConfig = compilerConfigQuery.findByName(compiler.getName());
         if (compilerConfig != null) {
             buildConfig.setCompiler(compilerConfig);
         } else {
@@ -86,7 +86,7 @@ public class SharedEntityChecker {
         }
 
         PackerConfig packer = buildConfig.getPacker();
-        PackerConfig packerConfig = packerQuery.findByName(packer.getName());
+        PackerConfig packerConfig = packerConfigQuery.findByName(packer.getName());
         if (packerConfig != null) {
             buildConfig.setPacker(packerConfig);
         } else {

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/AppQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/AppConfigQuery.java

@@ -22,10 +22,10 @@ import java.util.Map;
  */
 @CacheConfig(cacheNames = {"caffeineCacheManager"})
 @Service
-public class AppQuery {
+public class AppConfigQuery {
     private AppConfigRepository appRepository;
 
-    public AppQuery(AppConfigRepository appRepository) {
+    public AppConfigQuery(AppConfigRepository appRepository) {
         this.appRepository = appRepository;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/CompilerQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/CompilerConfigQuery.java

@@ -15,10 +15,10 @@ import java.util.List;
  */
 @CacheConfig(cacheNames = {"caffeineCacheManager"})
 @Service
-public class CompilerQuery {
+public class CompilerConfigQuery {
     private CompilerConfigRepository compilerRepository;
 
-    public CompilerQuery(CompilerConfigRepository compilerRepository) {
+    public CompilerConfigQuery(CompilerConfigRepository compilerRepository) {
         this.compilerRepository = compilerRepository;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/PackerQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/PackerConfigQuery.java

@@ -15,10 +15,10 @@ import java.util.List;
  */
 @CacheConfig(cacheNames = {"caffeineCacheManager"})
 @Service
-public class PackerQuery {
+public class PackerConfigQuery {
     private PackerConfigRepository packerRepository;
 
-    public PackerQuery(PackerConfigRepository packerRepository) {
+    public PackerConfigQuery(PackerConfigRepository packerRepository) {
         this.packerRepository = packerRepository;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/ProjQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/ProjConfigQuery.java

@@ -22,10 +22,10 @@ import java.util.Map;
  */
 @CacheConfig(cacheNames = {"caffeineCacheManager"})
 @Service
-public class ProjQuery {
+public class ProjConfigQuery {
     private ProjConfigRepository projRepository;
 
-    public ProjQuery(ProjConfigRepository projRepository) {
+    public ProjConfigQuery(ProjConfigRepository projRepository) {
         this.projRepository = projRepository;
     }
 

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service;
 
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.AppBuilding;
 import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
@@ -21,16 +21,16 @@ import java.util.stream.Collectors;
  */
 @Service
 public class AppBuildDeployService {
-    private AppQuery appQuery;
+    private AppConfigQuery appConfigQuery;
     private AppBuildingRepository buildingRepository;
     private AppDeployingRepository deployingRepository;
     private AppRunningRepository runningRepository;
 
-    public AppBuildDeployService(AppQuery appQuery,
+    public AppBuildDeployService(AppConfigQuery appConfigQuery,
                                  AppBuildingRepository buildingRepository,
                                  AppDeployingRepository deployingRepository,
                                  AppRunningRepository runningRepository) {
-        this.appQuery = appQuery;
+        this.appConfigQuery = appConfigQuery;
         this.buildingRepository = buildingRepository;
         this.deployingRepository = deployingRepository;
         this.runningRepository = runningRepository;
@@ -38,7 +38,7 @@ public class AppBuildDeployService {
 
     // TODO 启用 env 和 appType 字段，根据环境和应用类型来刷新，避免一次刷新过多应用
     public void refresh() {
-        List<AppConfig> apps = appQuery.findAll();
+        List<AppConfig> apps = appConfigQuery.findAll();
         Set<String> appIds = apps.stream().map(AppConfig::getAppId).collect(Collectors.toSet());
 
         refreshAppBuilding(apps, appIds);

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

@@ -4,7 +4,7 @@ import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
 import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
 import cn.reghao.autodop.common.http.DefaultWebRequest;
 import cn.reghao.autodop.common.http.WebRequest;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
@@ -42,7 +42,7 @@ public class AppOpsResultService {
     private BuildLogRepository buildLogRepository;
     private DeployLogRepository deployLogRepository;
     private AppDeployingRepository deployingRepository;
-    private AppQuery appQuery;
+    private AppConfigQuery appConfigQuery;
 
     public AppOpsResultService(MonitorService monitorService,
                                AppRunningRepository runningRepository,
@@ -50,7 +50,7 @@ public class AppOpsResultService {
                                BuildLogRepository buildLogRepository,
                                DeployLogRepository deployLogRepository,
                                AppDeployingRepository deployingRepository,
-                               AppQuery appQuery) {
+                               AppConfigQuery appConfigQuery) {
         this.monitorService = monitorService;
         this.runningRepository = runningRepository;
         this.notifyService = notifyService;
@@ -58,7 +58,7 @@ public class AppOpsResultService {
         this.buildLogRepository = buildLogRepository;
         this.deployLogRepository = deployLogRepository;
         this.deployingRepository = deployingRepository;
-        this.appQuery = appQuery;
+        this.appConfigQuery = appConfigQuery;
     }
 
     public void deployResult(DeployResult deployResult) {
@@ -97,7 +97,7 @@ public class AppOpsResultService {
     }
 
     private void deployNotify(BuildLog buildLog, DeployResult deployResult) {
-        AppConfig app = appQuery.findByAppId(buildLog.getAppId());
+        AppConfig app = appConfigQuery.findByAppId(buildLog.getAppId());
         List<NotifyGroup> notifyGroups = app.getNotifyGroups();
         notifyGroups.forEach(notifyGroup -> {
             String notifyType = notifyGroup.getNotifyType();

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

@@ -7,7 +7,7 @@ import cn.reghao.autodop.common.msg.rpc.dto.app.AppIdParam;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.model.constant.StatusOps;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
@@ -28,16 +28,16 @@ import java.util.List;
 public class AppStatusService {
     private DefaultMqttClient mqttClient;
     private AppRunningRepository runningRepository;
-    private AppQuery appQuery;
+    private AppConfigQuery appConfigQuery;
 
-    public AppStatusService(DefaultMqttClient mqttClient, AppRunningRepository runningRepository, AppQuery appQuery) {
+    public AppStatusService(DefaultMqttClient mqttClient, AppRunningRepository runningRepository, AppConfigQuery appConfigQuery) {
         this.mqttClient = mqttClient;
         this.runningRepository = runningRepository;
-        this.appQuery = appQuery;
+        this.appConfigQuery = appConfigQuery;
     }
 
     public void changeStatus(String appId, String machineId, StatusOps statusOps) {
-        AppConfig app = appQuery.findByAppId(appId);
+        AppConfig app = appConfigQuery.findByAppId(appId);
         switch (statusOps) {
             case restart:
                 setAppStatus(app, machineId, AppOps.appRestart);
@@ -74,7 +74,7 @@ public class AppStatusService {
         List<AppRunning> appRunnings = runningRepository.findAll();
         appRunnings.forEach(appRunning -> {
             String appId = appRunning.getAppId();
-            AppConfig app = appQuery.findByAppId(appId);
+            AppConfig app = appConfigQuery.findByAppId(appId);
             String machineId = appRunning.getMachineId();
             getStatus(app, machineId);
         });
@@ -86,7 +86,7 @@ public class AppStatusService {
 
     public void refreshAppStatus(AppRunning appRunning) {
         String appId = appRunning.getAppId();
-        AppConfig app = appQuery.findByAppId(appId);
+        AppConfig app = appConfigQuery.findByAppId(appId);
         String machineId = appRunning.getMachineId();
         getStatus(app, machineId);
     }
@@ -116,7 +116,7 @@ public class AppStatusService {
      * @date 2021-02-26 上午8:23
      */
     public List<LogFile> logFiles(String appId, String machineId) {
-        AppConfig app = appQuery.findByAppId(appId);
+        AppConfig app = appConfigQuery.findByAppId(appId);
         return null;
     }
 
@@ -128,7 +128,7 @@ public class AppStatusService {
      * @date 2021-02-26 上午8:23
      */
     public List<String> logContent(String appId, String logType, String logLevel, String machineId, String logFile) {
-        AppConfig app = appQuery.findByAppId(appId);
+        AppConfig app = appConfigQuery.findByAppId(appId);
         return null;
     }
 

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.service;
 
 import cn.reghao.jdkutil.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.AppBuilding;
 import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
 import cn.reghao.autodop.dmaster.app.model.po.log.*;
@@ -43,7 +43,7 @@ public class BuildDeployDispatcher {
     private Set<String> onBuilding = new ConcurrentSkipListSet<>();
     private Set<String> onDeploying = new ConcurrentSkipListSet<>();
     private Map<String, AppIntegrate> integrateMap = new ConcurrentHashMap<>();
-    private AppQuery appQuery;
+    private AppConfigQuery appConfigQuery;
     private ExecutorService threadPool;
     private AppDeployer appDeployer;
     private NotifyService notifyService;
@@ -51,14 +51,14 @@ public class BuildDeployDispatcher {
     public BuildDeployDispatcher(AppBuildingRepository appBuildingRepository,
                                  AppDeployingRepository appDeployingRepository,
                                  AppIntegrateReinitInterceptor reinitInterceptor,
-                                 AppQuery appQuery,
+                                 AppConfigQuery appConfigQuery,
                                  BuildLogRepository buildLogRepository,
                                  NotifyService notify,
                                  AppDeployer appDeployer) {
         this.appBuildingRepository = appBuildingRepository;
         this.appDeployingRepository = appDeployingRepository;
         this.reinitInterceptor = reinitInterceptor;
-        this.appQuery = appQuery;
+        this.appConfigQuery = appConfigQuery;
         this.buildLogRepository = buildLogRepository;
         this.notifyService = notify;
         this.appDeployer = appDeployer;
@@ -88,7 +88,7 @@ public class BuildDeployDispatcher {
             integrateMap.put(appId, appIntegrate);
         }*/
 
-        AppConfig app = appQuery.findByAppId(appId);
+        AppConfig app = appConfigQuery.findByAppId(appId);
         if (app == null) {
             onBuilding.remove(appId);
             throw new Exception(appId + " 不存在...");

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

@@ -6,7 +6,7 @@ import cn.reghao.autodop.common.message.ops.AppOps;
 import cn.reghao.autodop.common.msg.rpc.dto.app.DeployParam;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.jdkutil.serializer.JsonConverter;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import lombok.extern.slf4j.Slf4j;
@@ -25,15 +25,15 @@ import java.util.*;
 @Service
 public class AppDeployer {
     private DefaultMqttClient mqttClient;
-    private AppQuery appQuery;
+    private AppConfigQuery appConfigQuery;
 
-    public AppDeployer(DefaultMqttClient mqttClient, AppQuery appQuery) {
+    public AppDeployer(DefaultMqttClient mqttClient, AppConfigQuery appConfigQuery) {
         this.mqttClient = mqttClient;
-        this.appQuery = appQuery;
+        this.appConfigQuery = appConfigQuery;
     }
 
     public void deploy(BuildLog buildLog) throws MqttException {
-        List<DeployConfig> deployConfigs = appQuery.findByAppId(buildLog.getAppId()).getDeployConfigs();
+        List<DeployConfig> deployConfigs = appConfigQuery.findByAppId(buildLog.getAppId()).getDeployConfigs();
         for (DeployConfig deployConfig : deployConfigs) {
             DeployParam deployParam = new DeployParam();
             deployParam.setBuildLogId(buildLog.getId());

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

@@ -1,5 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service.config;
 
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 
 import java.util.List;
@@ -9,5 +10,7 @@ import java.util.List;
  * @date 2021-09-16 18:28:51
  */
 public interface AppConfigService {
+    void add(AppConfig appConfig);
+    void update(AppConfig appConfig);
     void setDeployConfig(int id, List<DeployConfig> deployConfigs);
 }

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

@@ -11,16 +11,13 @@ import java.util.List;
  * @date 2021-09-16 18:28:51
  */
 @Service
-public class AppConfigServiceImpl implements AppConfigService {
-
+public class AppConfigServiceImpl {
     private AppConfigCrud appConfigCrud;
 
     public AppConfigServiceImpl(AppConfigCrud appConfigCrud) {
         this.appConfigCrud = appConfigCrud;
     }
 
-    @Override
     public void setDeployConfig(int id, List<DeployConfig> deployConfigs) {
-
     }
 }

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

@@ -4,5 +4,5 @@ package cn.reghao.autodop.dmaster.app.service.config;
  * @author reghao
  * @date 2021-09-17 15:54:07
  */
-public interface CompilerConfig {
+public interface CompilerConfigService {
 }

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

@@ -4,5 +4,5 @@ package cn.reghao.autodop.dmaster.app.service.config;
  * @author reghao
  * @date 2021-09-17 15:54:16
  */
-public interface PackerConfig {
+public interface PackerConfigService {
 }

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

@@ -4,5 +4,5 @@ package cn.reghao.autodop.dmaster.app.service.config;
  * @author reghao
  * @date 2021-09-17 10:16:07
  */
-public interface RepoAuthService {
+public interface RepoAuthConfigService {
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/MonitorJobData.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.monitor.service;
 
 import cn.reghao.autodop.common.http.DefaultWebRequest;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import cn.reghao.autodop.dmaster.machine.db.crud.MachineStatCrud;
 import cn.reghao.autodop.dmaster.machine.db.query.MachineQuery;
@@ -32,7 +32,7 @@ public class MonitorJobData {
     private MachineStatQuery statQuery;
     private MachineQuery machineQuery;
     private AppRunningRepository runningRepository;
-    private AppQuery appQuery;
+    private AppConfigQuery appConfigQuery;
 
     public MonitorJobData(MonitorJobCrudService jobCrudService,
                           NotifyService notifyService,
@@ -40,14 +40,14 @@ public class MonitorJobData {
                           MachineStatQuery statQuery,
                           MachineQuery machineQuery,
                           AppRunningRepository runningRepository,
-                          AppQuery appQuery) {
+                          AppConfigQuery appConfigQuery) {
         this.jobCrudService = jobCrudService;
         this.notifyService = notifyService;
         this.statCrudService = statCrudService;
         this.statQuery = statQuery;
         this.machineQuery = machineQuery;
         this.runningRepository = runningRepository;
-        this.appQuery = appQuery;
+        this.appConfigQuery = appConfigQuery;
     }
 
     public JobId machineMonitorJobId(String machineId) {
@@ -101,7 +101,7 @@ public class MonitorJobData {
         jobDataMap.put("notifyService", notifyService);
         jobDataMap.put("jobCrudService", jobCrudService);
         jobDataMap.put("runningRepository", runningRepository);
-        jobDataMap.put("appQuery", appQuery);
+        jobDataMap.put("appQuery", appConfigQuery);
         jobDataMap.put("webRequest", new DefaultWebRequest());
         jobDataMap.put("appId", appId);
         jobDataMap.put("machineId", machineId);

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/job/AppHealthCheckJob.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.monitor.service.job;
 
 import cn.reghao.autodop.common.http.WebRequest;
-import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
 import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import cn.reghao.autodop.dmaster.monitor.db.MonitorJobCrudService;
@@ -42,12 +42,12 @@ public class AppHealthCheckJob implements Job {
         NotifyService notifyService = (NotifyService) jobDataMap.get("notifyService");
         MonitorJobCrudService jobCrudService = (MonitorJobCrudService) jobDataMap.get("jobCrudService");
         AppRunningRepository runningRepository = (AppRunningRepository) jobDataMap.get("runningRepository");
-        AppQuery appQuery = (AppQuery) jobDataMap.get("appQuery");
+        AppConfigQuery appConfigQuery = (AppConfigQuery) jobDataMap.get("appQuery");
         WebRequest webRequest = (WebRequest) jobDataMap.get("webRequest");
         String appId = jobDataMap.getString("appId");
         String machineId = jobDataMap.getString("machineId");
 
-        List<NotifyGroup> notifyGroups = appQuery.findByAppId(appId).getNotifyGroups();
+        List<NotifyGroup> notifyGroups = appConfigQuery.findByAppId(appId).getNotifyGroups();
 
         AppRunning appRunning = runningRepository.findByAppIdAndMachineId(appId, machineId);
         String machineIpv4 = appRunning.getMachineIpv4();

dmaster/src/main/java/cn/reghao/autodop/dmaster/spring/DmasterLifecycle.java

@@ -5,7 +5,7 @@ import ch.qos.logback.core.Appender;
 import cn.reghao.autodop.common.log.LoggerConfig;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.autodop.common.msg.MsgQueue;
-import cn.reghao.autodop.dmaster.app.db.crud.config.BuildDirCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.BuildDirCrud;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDirLocal;
 import cn.reghao.autodop.dmaster.mqttsub.MessageListener;
@@ -32,14 +32,14 @@ public class DmasterLifecycle implements ApplicationRunner, DisposableBean {
     private final String topic;
     private final MessageListener messageListener;
     private final DefaultMqttClient mqttClient;
-    private final BuildDirCrudService buildDirCrudService;
+    private final BuildDirCrud buildDirCrud;
 
     public DmasterLifecycle(NodeLogCrud nodeLogCrud, MessageListener messageListener,
-                            BuildDirCrudService buildDirCrudService, DefaultMqttClient mqttClient) {
+                            BuildDirCrud buildDirCrud, DefaultMqttClient mqttClient) {
         this.topic = MsgQueue.dmasterTopic();
         this.messageListener = messageListener;
         this.mqttClient = mqttClient;
-        this.buildDirCrudService = buildDirCrudService;
+        this.buildDirCrud = buildDirCrud;
         initLogger(nodeLogCrud);
     }
 
@@ -67,7 +67,7 @@ public class DmasterLifecycle implements ApplicationRunner, DisposableBean {
 
     private void initBuildDir() {
         log.info("初始化构建目录...");
-        BuildDir buildDir = buildDirCrudService.selectByUniqueKey(MachineId.id());
+        BuildDir buildDir = buildDirCrud.selectByUniqueKey(MachineId.id());
         if (buildDir == null) {
             buildDir = BuildDirLocal.setDefaultBuildDir();
         } else {
@@ -75,6 +75,6 @@ public class DmasterLifecycle implements ApplicationRunner, DisposableBean {
         }
 
         log.info("将 {} 写入数据库...", buildDir);
-        buildDirCrudService.insert(buildDir);
+        buildDirCrud.insert(buildDir);
     }
 }