优化 app 模块的代码结构

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/AppBakController.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.controller;
 
 import cn.reghao.jdkutil.result.WebBody;
 import cn.reghao.jdkutil.serializer.JsonConverter;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.util.UploadDownload;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,7 +46,7 @@ public class AppBakController {
     public String dataRestore(@RequestParam("file") MultipartFile file) throws IOException {
         byte[] bytes = file.getBytes();
         String json = new String(bytes, StandardCharsets.UTF_8);
-        AppOrchestration app = JsonConverter.jsonToObject(json, AppOrchestration.class);
+        AppConfig app = JsonConverter.jsonToObject(json, AppConfig.class);
         return WebBody.success();
     }
 }

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

@@ -6,8 +6,8 @@ import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.model.vo.NewApp;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+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.notification.model.po.NotifyGroup;
 import cn.reghao.autodop.dmaster.app.db.crud.config.AppConfigCrud;
 import cn.reghao.autodop.dmaster.app.db.crud.config.ProjCrudService;
@@ -45,7 +45,7 @@ public class AppConfigController {
     /* 应用编排 */
     @ApiOperation(value = "添加/修改应用编排")
     @PostMapping(value = "/app", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> addAppOrchestration(@Validated AppOrchestration app) {
+    public ResponseEntity<String> addAppOrchestration(@Validated AppConfig app) {
         Result result;
         try {
             // TODO app 属于 proj 时，提交的数据中 proj 是 null
@@ -60,7 +60,7 @@ public class AppConfigController {
     // TODO 使用 @PathVariable 注解时会自动填充实体
     @ApiOperation(value = "复制应用编排")
     @PostMapping(value = "/app/copy/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> copyAppOrchestration(@PathVariable("id") AppOrchestration app,
+    public ResponseEntity<String> copyAppOrchestration(@PathVariable("id") AppConfig app,
                                                        @Validated NewApp newApp) {
         Result result;
         try {
@@ -74,7 +74,7 @@ public class AppConfigController {
 
     @ApiOperation(value = "设置应用通知")
     @PostMapping(value = "/app/notify", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> appNotify(@RequestParam("id") AppOrchestration app,
+    public ResponseEntity<String> appNotify(@RequestParam("id") AppConfig app,
                                             @RequestParam("groupId") List<NotifyGroup> notifyGroups) {
         app.setNotifyGroups(notifyGroups);
         appConfigCrud.updateNotify(app);
@@ -83,14 +83,14 @@ public class AppConfigController {
 
     @ApiOperation(value = "删除应用编排")
     @DeleteMapping(value = "/app/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> deleteAppOrchestration(@PathVariable("id") AppOrchestration app) {
+    public ResponseEntity<String> deleteAppOrchestration(@PathVariable("id") AppConfig app) {
         Result result = appConfigCrud.delete(app);
         return ResponseEntity.ok().body(WebBody.result(result));
     }
 
     @ApiOperation(value = "应用部署配置")
     @PostMapping(value = "/app/deploy", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> appDeploy(@RequestParam("id") AppOrchestration app,
+    public ResponseEntity<String> appDeploy(@RequestParam("id") AppConfig app,
                                             @Validated DeployConfigs deployConfigs) {
         PackerConfig packerConfig = app.getPackerConfig();
         String packType = packerConfig.getType();
@@ -108,14 +108,14 @@ public class AppConfigController {
     /* 项目编排 */
     @ApiOperation(value = "添加/修改项目编排")
     @PostMapping(value = "/proj", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> addProjOrchestration(@Validated ProjOrchestration proj) {
+    public ResponseEntity<String> addProjOrchestration(@Validated ProjConfig proj) {
         Result result = projCrudService.insertOrUpdate(proj);
         return ResponseEntity.ok().body(WebBody.result(result));
     }
 
     @ApiOperation(value = "复制项目编排")
     @PostMapping(value = "/proj/copy/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> copyProjOrchestration(@PathVariable("id") ProjOrchestration proj,
+    public ResponseEntity<String> copyProjOrchestration(@PathVariable("id") ProjConfig proj,
                                                         @Validated NewApp newApp) {
         Result result = projCrudService.copy(proj, newApp);
         return ResponseEntity.ok().body(WebBody.result(result));
@@ -123,7 +123,7 @@ public class AppConfigController {
 
     @ApiOperation(value = "删除项目编排")
     @DeleteMapping(value = "/proj/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> deleteProjOrchestration(@PathVariable("id") ProjOrchestration proj) {
+    public ResponseEntity<String> deleteProjOrchestration(@PathVariable("id") ProjConfig proj) {
         Result result = projCrudService.delete(proj);
         return ResponseEntity.ok().body(WebBody.result(result));
     }

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

@@ -3,9 +3,8 @@ package cn.reghao.autodop.dmaster.app.controller.page;
 import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
 import cn.reghao.autodop.dmaster.app.model.constant.AppType;
 import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
-import cn.reghao.autodop.dmaster.machine.model.po.MachineHost;
 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;
@@ -13,8 +12,7 @@ import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.CompilerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.PackerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
 import cn.reghao.autodop.dmaster.notification.db.repository.NotifyGroupRepository;
 import cn.reghao.autodop.dmaster.util.db.PageList;
@@ -37,9 +35,9 @@ import java.util.stream.Collectors;
  * @date 2019-08-30 18:49:15
  */
 @Slf4j
-@Api(tags = "应用配置页面接口")
+@Api(tags = "应用配置页面")
 @Controller
-@RequestMapping("/app/config")
+@RequestMapping("/app/config/app")
 public class AppConfigPageController {
     private final AppQuery appQuery;
     private final ProjQuery projQuery;
@@ -49,9 +47,9 @@ public class AppConfigPageController {
     private final MachineHostQuery hostQuery;
     private final NotifyGroupRepository receiverRepository;
 
-    public AppConfigPageController(AppQuery appQuery, ProjQuery projQuery,
-                                   RepoAuthQuery repoAuthQuery, CompilerQuery compilerQuery, PackerQuery packerQuery,
-                                   MachineHostQuery hostQuery, NotifyGroupRepository receiverRepository) {
+    public AppConfigPageController(AppQuery appQuery, ProjQuery projQuery, RepoAuthQuery repoAuthQuery,
+                                   CompilerQuery compilerQuery, PackerQuery packerQuery, MachineHostQuery hostQuery,
+                                   NotifyGroupRepository receiverRepository) {
         this.appQuery = appQuery;
         this.projQuery = projQuery;
         this.repoAuthQuery = repoAuthQuery;
@@ -62,7 +60,7 @@ public class AppConfigPageController {
     }
 
     @ApiOperation(value = "应用配置页面")
-    @GetMapping("/app")
+    @GetMapping
     public String appConfigPage(@RequestParam(value = "env", required = false) String env,
                                 @RequestParam(value = "appName", required = false) String appName, Model model) {
         if (env == null) {
@@ -72,9 +70,9 @@ public class AppConfigPageController {
         if (appName != null) {
             Map<String, String> map = new HashMap<>();
             map.put("appName", appName);
-            List<AppOrchestration> list = appQuery.query(map);
-            Page<AppOrchestration> page = new PageImpl<>(list);
-            PageList<AppOrchestration> pageList = PageList.pageList(page);
+            List<AppConfig> list = appQuery.query(map);
+            Page<AppConfig> page = new PageImpl<>(list);
+            PageList<AppConfig> pageList = PageList.pageList(page);
 
             model.addAttribute("env", env);
             model.addAttribute("page", page);
@@ -83,8 +81,8 @@ public class AppConfigPageController {
         }
 
         PageRequest pageRequest = PageSort.pageRequest();
-        Page<AppOrchestration> appPage = appQuery.findByEnv(env, pageRequest);
-        PageList<AppOrchestration> pageList = PageList.pageList(appPage);
+        Page<AppConfig> appPage = appQuery.findByEnv(env, pageRequest);
+        PageList<AppConfig> pageList = PageList.pageList(appPage);
 
         model.addAttribute("env", env);
         model.addAttribute("page", appPage);
@@ -92,7 +90,7 @@ public class AppConfigPageController {
         return "/app/config/app/index";
     }
 
-    @GetMapping("/app/add")
+    @GetMapping("/add")
     public String addAppConfigPage(Model model) {
         setAppModel(model);
         return "/app/config/app/add";
@@ -165,29 +163,29 @@ public class AppConfigPageController {
         model.addAttribute("packers", packers);
     }
 
-    @GetMapping("/app/edit/{id}")
-    public String editAppConfigPage(@PathVariable("id") AppOrchestration app, Model model) {
+    @GetMapping("/edit/{id}")
+    public String editAppConfigPage(@PathVariable("id") AppConfig app, Model model) {
         setAppModel(model);
         model.addAttribute("app", app);
         return "/app/config/app/add";
     }
 
-    @GetMapping("/app/copy/{id}")
-    public String copyAppConfigPage(@PathVariable("id") AppOrchestration app, Model model) {
+    @GetMapping("/copy/{id}")
+    public String copyAppConfigPage(@PathVariable("id") AppConfig app, Model model) {
         model.addAttribute("app", app);
         return "/app/config/app/copy";
     }
 
-    @GetMapping("/app/detail/{appId}")
+    @GetMapping("/detail/{appId}")
     public String appConfigPage(@PathVariable("appId") String appId, Model model) {
-        AppOrchestration app = appQuery.findByAppId(appId);
+        AppConfig app = appQuery.findByAppId(appId);
         model.addAttribute("app", app);
         return "/app/config/app/detail";
     }
 
     @ApiOperation(value = "通知配置页面")
-    @GetMapping("/app/notify/{id}")
-    public String receiverIdsPage(@PathVariable("id") AppOrchestration app, Model model) {
+    @GetMapping("/notify/{id}")
+    public String receiverIdsPage(@PathVariable("id") AppConfig app, Model model) {
         Set<NotifyGroup> currentSet = new HashSet<>(app.getNotifyGroups());
         List<NotifyGroup> list = receiverRepository.findAll();
 
@@ -198,8 +196,8 @@ public class AppConfigPageController {
     }
 
     @ApiOperation(value = "部署配置页面")
-    @GetMapping("/app/deploy/{id}")
-    public String deployConfigPage(@PathVariable("id") AppOrchestration app, Model model) {
+    @GetMapping("/deploy/{id}")
+    public String deployConfigPage(@PathVariable("id") AppConfig app, Model model) {
         int id = app.getId();
         List<DeployConfig> list = app.getDeployConfigs();
         if (list == null) {
@@ -218,55 +216,4 @@ public class AppConfigPageController {
         model.addAttribute("list", list);
         return "/app/config/app/deploy";
     }
-
-    @ApiOperation(value = "项目配置页面")
-    @GetMapping("/proj")
-    public String projConfigPage(@RequestParam(value = "projName", required = false) String projName, Model model) {
-
-        /*if (projName != null) {
-            Map<String, String> map = new HashMap<>();
-            map.put("projName", projName);
-            List<AppOrchestration> list = appConfigQuery.query(map);
-            Page<AppOrchestration> page = new PageImpl<>(list);
-            PageList<AppOrchestration> pageList = PageList.pageList(page);
-
-            model.addAttribute("page", page);
-            model.addAttribute("list", pageList.getList());
-            return "/app/config/app/index";
-        }*/
-
-        PageRequest pageRequest = PageSort.pageRequest();
-        Page<ProjOrchestration> page = projQuery.findByIsDeleteFalse(pageRequest);
-        PageList<ProjOrchestration> pageList = PageList.pageList(page);
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
-        return "/app/config/proj/index";
-    }
-
-    @GetMapping("/proj/add")
-    public String addProjConfigPage(Model model) {
-        setCommon(model);
-        return "/app/config/proj/add";
-    }
-
-    @GetMapping("/proj/edit/{id}")
-    public String editProjConfigPage(@PathVariable("id") ProjOrchestration proj, Model model) {
-        setCommon(model);
-        model.addAttribute("proj", proj);
-        return "/app/config/proj/add";
-    }
-
-    @GetMapping("/proj/copy/{id}")
-    public String copyProjConfigPage(@PathVariable("id") ProjOrchestration proj, Model model) {
-        model.addAttribute("proj", proj);
-        return "/app/config/proj/copy";
-    }
-
-    @GetMapping("/proj/detail/{projId}")
-    public String projConfigDetailPage(@PathVariable("projId") String projId, Model model) {
-        ProjOrchestration proj = projQuery.findByIsDeleteFalseAndProjId(projId);
-        model.addAttribute("proj", proj);
-        return "/app/config/proj/detail";
-    }
 }

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

@@ -8,8 +8,8 @@ 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.model.po.AppDeploying;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.model.po.AppBuilding;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildTime;
@@ -114,7 +114,7 @@ public class AppPageController {
     @ApiOperation(value = "部署页面")
     @GetMapping("/deploy/{appId}")
     public String deployPage(@PathVariable("appId") String appId, Model model) {
-        AppOrchestration app = appQuery.findByIsDeleteFalseAndAppId(appId);
+        AppConfig app = appQuery.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/BuildConfigPageController.java

@@ -1,213 +0,0 @@
-package cn.reghao.autodop.dmaster.app.controller.page;
-
-import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
-import cn.reghao.autodop.common.machine.disk.Disk;
-import cn.reghao.autodop.dmaster.app.model.constant.build.CompileType;
-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.build.BuildDirQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.build.CompilerQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.build.PackerQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
-import cn.reghao.autodop.dmaster.machine.model.vo.DiskUsage;
-import cn.reghao.autodop.dmaster.util.db.PageList;
-import cn.reghao.autodop.dmaster.util.db.PageSort;
-import cn.reghao.autodop.dmaster.spring.DmasterLifecycle;
-import cn.reghao.jdkutil.MachineId;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2019-08-30 18:49:15
- */
-@Slf4j
-@Api(tags = "构建配置页面接口")
-@Controller
-@RequestMapping("/app/config/build")
-public class BuildConfigPageController {
-    private BuildDirQuery buildDirQuery;
-    private RepoAuthQuery repoAuthQuery;
-    private CompilerQuery compilerQuery;
-    private PackerQuery packerQuery;
-    private Disk disk;
-
-    public BuildConfigPageController(BuildDirQuery buildDirQuery, RepoAuthQuery repoAuthQuery,
-                                     CompilerQuery compilerQuery, PackerQuery packerQuery, Disk disk) {
-        this.buildDirQuery = buildDirQuery;
-        this.repoAuthQuery = repoAuthQuery;
-        this.compilerQuery = compilerQuery;
-        this.packerQuery = packerQuery;
-        this.disk = disk;
-    }
-
-    @ApiOperation(value = "构建目录页面")
-    @GetMapping("/dir")
-    public String buildDirPage(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        Page<BuildDir> page = buildDirQuery.findByPage(pageRequest);
-        PageList<BuildDir> pageList = PageList.pageList(page);
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
-        return "/app/config/builddir/index";
-    }
-
-    @GetMapping("/dir/diskinfo")
-    public String diskInfoPage(Model model) {
-        List<DiskUsage> diskUsages = disk.info().stream().map(DiskUsage::new).collect(Collectors.toList());
-        model.addAttribute("list", diskUsages);
-        return "/app/config/builddir/diskinfo";
-    }
-
-    @GetMapping("/dir/edit/{id}")
-    public String editAppConfigPage(@PathVariable("id") BuildDir buildDir, Model model) {
-        model.addAttribute("buildDir", buildDir);
-        return "/app/config/builddir/add";
-    }
-
-    @ApiOperation(value = "仓库认证页面")
-    @GetMapping("/repoauth")
-    public String repoAuthPage(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        Page<RepoAuthConfig> page = repoAuthQuery.findAll(pageRequest);
-        PageList<RepoAuthConfig> pageList = PageList.pageList(page);
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
-        return "/app/config/repoauth/index";
-    }
-
-    @GetMapping("/repoauth/add")
-    public String addRepoAuthPage(Model model) {
-        setRepoAuthModel(model);
-        return "/app/config/repoauth/add";
-    }
-
-    @GetMapping("/repoauth/edit/{id}")
-    public String editRepoAuthPage(@PathVariable("id") RepoAuthConfig repoAuth, Model model) {
-        setRepoAuthModel(model);
-        model.addAttribute("repoAuth", repoAuth);
-        return "/app/config/repoauth/add";
-    }
-
-    private void setRepoAuthModel(Model model) {
-        List<KeyValue> repos = new ArrayList<>();
-        for (RepoType repoType : RepoType.values()) {
-            repos.add(new KeyValue(repoType.name(), repoType.name()));
-        }
-
-        List<KeyValue> auths = new ArrayList<>();
-        for (RepoAuthType authType : RepoAuthType.values()) {
-            auths.add(new KeyValue(authType.name(), authType.name()));
-        }
-
-        model.addAttribute("repos", repos);
-        model.addAttribute("auths", auths);
-    }
-
-    @GetMapping("/repoauth/detail/{id}")
-    public String repoAuthDetailPage(@PathVariable("id") RepoAuthConfig repoAuth, Model model) {
-        model.addAttribute("repoAuth", repoAuth);
-        return "/app/config/repoauth/detail";
-    }
-
-    @ApiOperation(value = "编译配置页面")
-    @GetMapping("/compiler")
-    public String compilerConfigPage(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        Page<CompilerConfig> page = compilerQuery.findAll(pageRequest);
-        PageList<CompilerConfig> pageList = PageList.pageList(page);
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
-        return "/app/config/compiler/index";
-    }
-
-    @GetMapping("/compiler/add")
-    public String addCompilerPage(Model model) {
-        setCompilerModel(model);
-        return "/app/config/compiler/add";
-    }
-
-    @GetMapping("/compiler/edit/{id}")
-    public String editCompilerPage(@PathVariable("id") CompilerConfig compilerConfig, Model model) {
-        setCompilerModel(model);
-        model.addAttribute("compiler", compilerConfig);
-        return "/app/config/compiler/add";
-    }
-
-    private void setCompilerModel(Model model) {
-        List<KeyValue> compileTypes = new ArrayList<>();
-        for (CompileType compileType : CompileType.values()) {
-            compileTypes.add(new KeyValue(compileType.name(), compileType.name()));
-        }
-        model.addAttribute("compileTypes", compileTypes);
-        model.addAttribute("machineId", MachineId.id());
-        model.addAttribute("machineIpv4", MachineId.ipv4());
-    }
-
-    @GetMapping("/compiler/detail/{id}")
-    public String compilerDetailPage(@PathVariable("id") CompilerConfig compilerConfig, Model model) {
-        model.addAttribute("compiler", compilerConfig);
-        return "/app/config/compiler/detail";
-    }
-
-    @ApiOperation(value = "打包配置页面")
-    @GetMapping("/packer")
-    public String packerPage(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        Page<PackerConfig> page = packerQuery.findAll(pageRequest);
-        PageList<PackerConfig> pageList = PageList.pageList(page);
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", pageList.getList());
-        return "/app/config/packer/index";
-    }
-
-    @GetMapping("/packer/add")
-    public String addPackerPage(Model model) {
-        setPackerModel(model);
-        return "/app/config/packer/add";
-    }
-
-    @GetMapping("/packer/edit/{id}")
-    public String editPackerPage(@PathVariable("id") PackerConfig packerConfig, Model model) {
-        setPackerModel(model);
-        model.addAttribute("packer", packerConfig);
-        return "/app/config/packer/add";
-    }
-
-    private void setPackerModel(Model model) {
-        List<KeyValue> packTypes = new ArrayList<>();
-        for (PackType packType : PackType.values()) {
-            packTypes.add(new KeyValue(packType.name(), packType.name()));
-        }
-        model.addAttribute("packTypes", packTypes);
-        model.addAttribute("machineId", MachineId.id());
-        model.addAttribute("machineIpv4", MachineId.ipv4());
-    }
-
-    @GetMapping("/packer/detail/{id}")
-    public String packerDetailPage(@PathVariable("id") PackerConfig packerConfig, Model model) {
-        model.addAttribute("packer", packerConfig);
-        return "/app/config/packer/detail";
-    }
-}

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

@@ -0,0 +1,64 @@
+package cn.reghao.autodop.dmaster.app.controller.page;
+
+import cn.reghao.autodop.common.machine.disk.Disk;
+import cn.reghao.autodop.dmaster.app.db.query.config.build.BuildDirQuery;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
+import cn.reghao.autodop.dmaster.machine.model.vo.DiskUsage;
+import cn.reghao.autodop.dmaster.util.db.PageList;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author reghao
+ * @date 2019-08-30 18:49:15
+ */
+@Slf4j
+@Api(tags = "构建目录配置页面")
+@Controller
+@RequestMapping("/app/config/build/dir")
+public class BuildDirPageController {
+    private BuildDirQuery buildDirQuery;
+    private Disk disk;
+
+    public BuildDirPageController(BuildDirQuery buildDirQuery, Disk disk) {
+        this.buildDirQuery = buildDirQuery;
+        this.disk = disk;
+    }
+
+    @ApiOperation(value = "构建目录页面")
+    @GetMapping
+    public String buildDirPage(Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        Page<BuildDir> page = buildDirQuery.findByPage(pageRequest);
+        PageList<BuildDir> pageList = PageList.pageList(page);
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", pageList.getList());
+        return "/app/config/builddir/index";
+    }
+
+    @GetMapping("/diskinfo")
+    public String diskInfoPage(Model model) {
+        List<DiskUsage> diskUsages = disk.info().stream().map(DiskUsage::new).collect(Collectors.toList());
+        model.addAttribute("list", diskUsages);
+        return "/app/config/builddir/diskinfo";
+    }
+
+    @GetMapping("/edit/{id}")
+    public String editAppConfigPage(@PathVariable("id") BuildDir buildDir, Model model) {
+        model.addAttribute("buildDir", buildDir);
+        return "/app/config/builddir/add";
+    }
+}

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

@@ -0,0 +1,79 @@
+package cn.reghao.autodop.dmaster.app.controller.page;
+
+import cn.reghao.autodop.dmaster.app.db.query.config.build.CompilerQuery;
+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;
+import cn.reghao.autodop.dmaster.util.db.PageList;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
+import cn.reghao.jdkutil.MachineId;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2021-09-17 10:31:15
+ */
+@Slf4j
+@Api(tags = "应用编译配置页面")
+@Controller
+@RequestMapping("/app/config/build/compiler")
+public class CompilerPageController {
+    private final CompilerQuery compilerQuery;
+
+    public CompilerPageController(CompilerQuery compilerQuery) {
+        this.compilerQuery = compilerQuery;
+    }
+
+    @ApiOperation(value = "编译配置页面")
+    @GetMapping
+    public String compilerConfigPage(Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        Page<CompilerConfig> page = compilerQuery.findAll(pageRequest);
+        PageList<CompilerConfig> pageList = PageList.pageList(page);
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", pageList.getList());
+        return "/app/config/compiler/index";
+    }
+
+    @GetMapping("/add")
+    public String addCompilerPage(Model model) {
+        setCompilerModel(model);
+        return "/app/config/compiler/add";
+    }
+
+    @GetMapping("/edit/{id}")
+    public String editCompilerPage(@PathVariable("id") CompilerConfig compilerConfig, Model model) {
+        setCompilerModel(model);
+        model.addAttribute("compiler", compilerConfig);
+        return "/app/config/compiler/add";
+    }
+
+    private void setCompilerModel(Model model) {
+        List<KeyValue> compileTypes = new ArrayList<>();
+        for (CompileType compileType : CompileType.values()) {
+            compileTypes.add(new KeyValue(compileType.name(), compileType.name()));
+        }
+        model.addAttribute("compileTypes", compileTypes);
+        model.addAttribute("machineId", MachineId.id());
+        model.addAttribute("machineIpv4", MachineId.ipv4());
+    }
+
+    @GetMapping("/detail/{id}")
+    public String compilerDetailPage(@PathVariable("id") CompilerConfig compilerConfig, Model model) {
+        model.addAttribute("compiler", compilerConfig);
+        return "/app/config/compiler/detail";
+    }
+}

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

@@ -0,0 +1,79 @@
+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.build.PackerQuery;
+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;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
+import cn.reghao.jdkutil.MachineId;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2021-09-17 10:31:15
+ */
+@Slf4j
+@Api(tags = "应用打包配置页面")
+@Controller
+@RequestMapping("/app/config/build/packer")
+public class PackerPageController {
+    private PackerQuery packerQuery;
+
+    public PackerPageController(PackerQuery packerQuery) {
+        this.packerQuery = packerQuery;
+    }
+
+    @ApiOperation(value = "打包配置页面")
+    @GetMapping
+    public String packerPage(Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        Page<PackerConfig> page = packerQuery.findAll(pageRequest);
+        PageList<PackerConfig> pageList = PageList.pageList(page);
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", pageList.getList());
+        return "/app/config/packer/index";
+    }
+
+    @GetMapping("/add")
+    public String addPackerPage(Model model) {
+        setPackerModel(model);
+        return "/app/config/packer/add";
+    }
+
+    @GetMapping("/edit/{id}")
+    public String editPackerPage(@PathVariable("id") PackerConfig packerConfig, Model model) {
+        setPackerModel(model);
+        model.addAttribute("packer", packerConfig);
+        return "/app/config/packer/add";
+    }
+
+    private void setPackerModel(Model model) {
+        List<KeyValue> packTypes = new ArrayList<>();
+        for (PackType packType : PackType.values()) {
+            packTypes.add(new KeyValue(packType.name(), packType.name()));
+        }
+        model.addAttribute("packTypes", packTypes);
+        model.addAttribute("machineId", MachineId.id());
+        model.addAttribute("machineIpv4", MachineId.ipv4());
+    }
+
+    @GetMapping("/detail/{id}")
+    public String packerDetailPage(@PathVariable("id") PackerConfig packerConfig, Model model) {
+        model.addAttribute("packer", packerConfig);
+        return "/app/config/packer/detail";
+    }
+}

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

@@ -0,0 +1,129 @@
+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.build.CompilerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.build.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
+import cn.reghao.autodop.dmaster.app.model.constant.AppType;
+import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
+import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
+import cn.reghao.autodop.dmaster.util.db.PageList;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author reghao
+ * @date 2021-09-17 10:17:15
+ */
+@Slf4j
+@Api(tags = "项目配置页面")
+@Controller
+@RequestMapping("/app/config/proj")
+public class ProjConfigPageController {
+    private final ProjQuery projQuery;
+    private final RepoAuthQuery repoAuthQuery;
+    private final CompilerQuery compilerQuery;
+    private final PackerQuery packerQuery;
+
+    public ProjConfigPageController(ProjQuery projQuery, RepoAuthQuery repoAuthQuery,
+                                    CompilerQuery compilerQuery, PackerQuery packerQuery) {
+        this.projQuery = projQuery;
+        this.repoAuthQuery = repoAuthQuery;
+        this.compilerQuery = compilerQuery;
+        this.packerQuery = packerQuery;
+    }
+
+    private void setCommon(Model model) {
+        List<KeyValue> envs = new ArrayList<>();
+        for (EnvList envList : EnvList.values()) {
+            envs.add(new KeyValue(envList.name(), envList.name()));
+        }
+
+        List<KeyValue> appTypes = new ArrayList<>();
+        for (AppType appType : AppType.values()) {
+            appTypes.add(new KeyValue(appType.name(), appType.name()));
+        }
+        model.addAttribute("environments", envs);
+        model.addAttribute("appTypes", appTypes);
+
+        List<KeyValue> repoAuths = repoAuthQuery.findAllByIsDeleteFalse().stream()
+                .map(repoAuthConfig -> new KeyValue(String.valueOf(repoAuthConfig.getName()), repoAuthConfig.getName()))
+                .collect(Collectors.toList());
+
+        List<KeyValue> compilers = compilerQuery.findAllByIsDeleteFalse().stream()
+                .map(compilerConfig -> new KeyValue(String.valueOf(compilerConfig.getName()), compilerConfig.getName()))
+                .collect(Collectors.toList());
+
+        List<KeyValue> packers = packerQuery.findAllByIsDeleteFalse().stream()
+                .map(packerConfig -> new KeyValue(String.valueOf(packerConfig.getName()), packerConfig.getName()))
+                .collect(Collectors.toList());
+        model.addAttribute("repoAuths", repoAuths);
+        model.addAttribute("compilers", compilers);
+        model.addAttribute("packers", packers);
+    }
+
+    @ApiOperation(value = "项目配置页面")
+    @GetMapping
+    public String projConfigPage(@RequestParam(value = "projName", required = false) String projName, Model model) {
+
+        /*if (projName != null) {
+            Map<String, String> map = new HashMap<>();
+            map.put("projName", projName);
+            List<AppOrchestration> list = appConfigQuery.query(map);
+            Page<AppOrchestration> page = new PageImpl<>(list);
+            PageList<AppOrchestration> pageList = PageList.pageList(page);
+
+            model.addAttribute("page", page);
+            model.addAttribute("list", pageList.getList());
+            return "/app/config/app/index";
+        }*/
+
+        PageRequest pageRequest = PageSort.pageRequest();
+        Page<ProjConfig> page = projQuery.findByIsDeleteFalse(pageRequest);
+        PageList<ProjConfig> pageList = PageList.pageList(page);
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", pageList.getList());
+        return "/app/config/proj/index";
+    }
+
+    @GetMapping("/add")
+    public String addProjConfigPage(Model model) {
+        setCommon(model);
+        return "/app/config/proj/add";
+    }
+
+    @GetMapping("/edit/{id}")
+    public String editProjConfigPage(@PathVariable("id") ProjConfig proj, Model model) {
+        setCommon(model);
+        model.addAttribute("proj", proj);
+        return "/app/config/proj/add";
+    }
+
+    @GetMapping("/copy/{id}")
+    public String copyProjConfigPage(@PathVariable("id") ProjConfig proj, Model model) {
+        model.addAttribute("proj", proj);
+        return "/app/config/proj/copy";
+    }
+
+    @GetMapping("/detail/{projId}")
+    public String projConfigDetailPage(@PathVariable("projId") String projId, Model model) {
+        ProjConfig proj = projQuery.findByIsDeleteFalseAndProjId(projId);
+        model.addAttribute("proj", proj);
+        return "/app/config/proj/detail";
+    }
+}

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

@@ -0,0 +1,84 @@
+package cn.reghao.autodop.dmaster.app.controller.page;
+
+import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
+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.model.po.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
+import cn.reghao.autodop.dmaster.util.db.PageList;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2021-09-17 10:31:15
+ */
+@Slf4j
+@Api(tags = "仓库认证配置页面")
+@Controller
+@RequestMapping("/app/config/build")
+public class RepoAuthPageController {
+    private RepoAuthQuery repoAuthQuery;
+
+    public RepoAuthPageController(RepoAuthQuery repoAuthQuery) {
+        this.repoAuthQuery = repoAuthQuery;
+    }
+
+    @ApiOperation(value = "仓库认证页面")
+    @GetMapping("/repoauth")
+    public String repoAuthPage(Model model) {
+        PageRequest pageRequest = PageSort.pageRequest();
+        Page<RepoAuthConfig> page = repoAuthQuery.findAll(pageRequest);
+        PageList<RepoAuthConfig> pageList = PageList.pageList(page);
+
+        model.addAttribute("page", page);
+        model.addAttribute("list", pageList.getList());
+        return "/app/config/repoauth/index";
+    }
+
+    @GetMapping("/repoauth/add")
+    public String addRepoAuthPage(Model model) {
+        setRepoAuthModel(model);
+        return "/app/config/repoauth/add";
+    }
+
+    @GetMapping("/repoauth/edit/{id}")
+    public String editRepoAuthPage(@PathVariable("id") RepoAuthConfig repoAuth, Model model) {
+        setRepoAuthModel(model);
+        model.addAttribute("repoAuth", repoAuth);
+        return "/app/config/repoauth/add";
+    }
+
+    private void setRepoAuthModel(Model model) {
+        List<KeyValue> repos = new ArrayList<>();
+        for (RepoType repoType : RepoType.values()) {
+            repos.add(new KeyValue(repoType.name(), repoType.name()));
+        }
+
+        List<KeyValue> auths = new ArrayList<>();
+        for (RepoAuthType authType : RepoAuthType.values()) {
+            auths.add(new KeyValue(authType.name(), authType.name()));
+        }
+
+        model.addAttribute("repos", repos);
+        model.addAttribute("auths", auths);
+    }
+
+    @GetMapping("/repoauth/detail/{id}")
+    public String repoAuthDetailPage(@PathVariable("id") RepoAuthConfig repoAuth, Model model) {
+        model.addAttribute("repoAuth", repoAuth);
+        return "/app/config/repoauth/detail";
+    }
+}

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

@@ -6,18 +6,15 @@ import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.model.constant.AppType;
 import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.machine.db.crud.MachineInfoCrud;
-import cn.reghao.autodop.dmaster.machine.model.po.MachineInfo;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyType;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import cn.reghao.autodop.dmaster.app.service.AppBuildDeployService;
 import cn.reghao.autodop.dmaster.app.model.vo.NewApp;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.db.repository.config.AppOrchestrationRepository;
-import org.springframework.cache.annotation.CacheConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.AppConfigRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -34,13 +31,13 @@ import java.util.stream.Collectors;
 //@CacheConfig(cacheNames = {"caffeineCacheManager"})
 @Service
 public class AppConfigCrud {
-    private AppOrchestrationRepository appRepository;
+    private AppConfigRepository appRepository;
     private MachineHostQuery machineHostQuery;
     private SharedEntityChecker sharedEntityChecker;
     private AppBuildDeployService appBuildService;
     private AppRunningRepository runningRepository;
 
-    public AppConfigCrud(AppOrchestrationRepository appRepository,
+    public AppConfigCrud(AppConfigRepository appRepository,
                          MachineHostQuery machineHostQuery,
                          SharedEntityChecker sharedEntityChecker,
                          AppBuildDeployService appBuildService,
@@ -55,7 +52,7 @@ public class AppConfigCrud {
     // TODO 数据修改后要在引用它的对象中立即体现
     //@CachePut(cacheNames = {"app"}, key = "#app.appId")
     @Transactional(rollbackFor = Exception.class)
-    public Result insertOrUpdate(AppOrchestration app) throws Exception {
+    public Result insertOrUpdate(AppConfig app) throws Exception {
         // TODO 处理所有与 app 关联的数据
         // TODO 不能有应用处于构建中
         Integer id = app.getId();
@@ -80,12 +77,12 @@ public class AppConfigCrud {
         return Result.result(ResultStatus.SUCCESS, msg);
     }
 
-    public Result updateNotify(AppOrchestration app) {
+    public Result updateNotify(AppConfig app) {
         appRepository.save(app);
         return Result.result(ResultStatus.SUCCESS);
     }
 
-    private Result checkEnum(AppOrchestration app) {
+    private Result checkEnum(AppConfig app) {
         Set<String> envs = Arrays.stream(EnvList.values())
                 .map(Enum::name)
                 .collect(Collectors.toSet());
@@ -107,7 +104,7 @@ public class AppConfigCrud {
         return Result.result(ResultStatus.SUCCESS);
     }
 
-    private void checkNotifyGroups(AppOrchestration app) {
+    private void checkNotifyGroups(AppConfig app) {
         // TODO 根据通知类型创建相应的通知实例
 
         Set<String> notifyTypes = Arrays.stream(NotifyType.values())
@@ -120,9 +117,9 @@ public class AppConfigCrud {
         app.setNotifyReceivers(notifyReceivers);*/
     }
 
-    private void checkDeployConfigs(AppOrchestration app) {
+    private void checkDeployConfigs(AppConfig app) {
         // TODO null 异常不会被 ControllerExceptionHandler 捕获
-        ProjOrchestration proj = app.getProj();
+        ProjConfig proj = app.getProj();
         String packType;
         if (proj != null) {
             packType = proj.getPackerConfig().getType();
@@ -147,7 +144,7 @@ public class AppConfigCrud {
         app.setDeployConfigs(deployConfigs);
     }
 
-    private void checkSharedEntity(AppOrchestration app) throws Exception {
+    private void checkSharedEntity(AppConfig app) throws Exception {
         if (app.getProj() == null) {
             sharedEntityChecker.checkAndSetBuildConfig(app);
         } else {
@@ -155,25 +152,25 @@ public class AppConfigCrud {
         }
     }
 
-    public Result copy(AppOrchestration from, NewApp to) throws Exception {
+    public Result copy(AppConfig from, NewApp to) throws Exception {
         if (from == null) {
             String msg = "应用配置不存在...";
             return Result.result(ResultStatus.FAIL, msg);
         }
 
-        AppOrchestration toApp = appRepository.findByIsDeleteFalseAndAppId(to.getNewId());
+        AppConfig toApp = appRepository.findByIsDeleteFalseAndAppId(to.getNewId());
         if (toApp != null) {
             String msg = to.getNewId() + " 已存在";
             return Result.result(ResultStatus.FAIL, msg);
         }
 
-        toApp = to.app((AppOrchestration) from.clone());
+        toApp = to.app((AppConfig) from.clone());
         return insertOrUpdate(toApp);
     }
 
     //@CacheEvict(cacheNames = {"app"}, key = "#app.appId")
     @Transactional(rollbackFor = Exception.class)
-    public Result delete(AppOrchestration app) {
+    public Result delete(AppConfig app) {
         String appId = app.getAppId();
         List<AppRunning> appRunnings = runningRepository.findByAppId(appId).stream()
                 .filter(AppRunning::getIsRunning).collect(Collectors.toList());

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

@@ -2,10 +2,10 @@ 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.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.db.repository.config.AppOrchestrationRepository;
-import cn.reghao.autodop.dmaster.app.db.repository.config.ProjOrchestrationRepository;
+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.db.repository.config.AppConfigRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.config.ProjConfigRepository;
 import cn.reghao.autodop.dmaster.app.model.vo.NewApp;
 import org.springframework.stereotype.Service;
 
@@ -19,23 +19,23 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ProjCrudService {
-    private ProjOrchestrationRepository projRepository;
-    private AppOrchestrationRepository appRepository;
+    private ProjConfigRepository projRepository;
+    private AppConfigRepository appRepository;
     private SharedEntityChecker sharedEntityChecker;
 
-    public ProjCrudService(ProjOrchestrationRepository projRepository,
-                           AppOrchestrationRepository appRepository,
+    public ProjCrudService(ProjConfigRepository projRepository,
+                           AppConfigRepository appRepository,
                            SharedEntityChecker sharedEntityChecker) {
         this.projRepository = projRepository;
         this.appRepository = appRepository;
         this.sharedEntityChecker = sharedEntityChecker;
     }
 
-    public Result insertOrUpdate(ProjOrchestration proj) {
+    public Result insertOrUpdate(ProjConfig proj) {
         try {
             Integer id = proj.getId();
             sharedEntityChecker.checkAndSetBuildConfig(proj);
-            ProjOrchestration projEntity = projRepository.findByIsDeleteFalseAndProjId(proj.getProjId());
+            ProjConfig projEntity = projRepository.findByIsDeleteFalseAndProjId(proj.getProjId());
             if (projEntity != null) {
                 proj.setId(projEntity.getId());
                 proj.setCreateTime(projEntity.getCreateTime());
@@ -52,20 +52,20 @@ public class ProjCrudService {
         }
     }
 
-    public Result copy(ProjOrchestration from, NewApp to) {
+    public Result copy(ProjConfig from, NewApp to) {
         if (from == null) {
             String msg = "项目配置不存在...";
             return Result.result(ResultStatus.FAIL, msg);
         }
 
-        ProjOrchestration toProj = projRepository.findByIsDeleteFalseAndProjId(to.getNewId());
+        ProjConfig toProj = projRepository.findByIsDeleteFalseAndProjId(to.getNewId());
         if (toProj != null) {
             String msg = to.getNewId() + " 已存在";
             return Result.result(ResultStatus.FAIL, msg);
         }
 
         try {
-            toProj = to.proj((ProjOrchestration) from.clone());
+            toProj = to.proj((ProjConfig) from.clone());
             insertOrUpdate(toProj);
             return Result.result(ResultStatus.SUCCESS);
         } catch (CloneNotSupportedException e) {
@@ -74,13 +74,13 @@ public class ProjCrudService {
         }
     }
 
-    public Result delete(ProjOrchestration proj) {
-        List<AppOrchestration> apps = appRepository.findAllByProj(proj);
+    public Result delete(ProjConfig proj) {
+        List<AppConfig> apps = appRepository.findAllByProj(proj);
         if (apps.isEmpty()) {
             projRepository.delete(proj);
             return Result.result(ResultStatus.SUCCESS);
         } else {
-            String appIds = apps.stream().map(AppOrchestration::getAppId).collect(Collectors.joining());
+            String appIds = apps.stream().map(AppConfig::getAppId).collect(Collectors.joining());
             String msg = proj.getProjName() + " 删除失败, " + appIds + " 等应用正在使用";
             return Result.result(ResultStatus.FAIL, msg);
         }

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

@@ -7,8 +7,8 @@ import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+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.vo.BuildConfig;
 import org.springframework.stereotype.Service;
 
@@ -33,9 +33,9 @@ public class SharedEntityChecker {
         this.packerQuery = packerQuery;
     }
 
-    public void checkAndSetProj(AppOrchestration app) throws Exception {
-        ProjOrchestration proj = app.getProj();
-        ProjOrchestration entity = projQuery.findByIsDeleteFalseAndProjId(proj.getProjId());
+    public void checkAndSetProj(AppConfig app) throws Exception {
+        ProjConfig proj = app.getProj();
+        ProjConfig entity = projQuery.findByIsDeleteFalseAndProjId(proj.getProjId());
         if (entity != null) {
             app.setProj(entity);
         } else {
@@ -50,7 +50,7 @@ public class SharedEntityChecker {
      * @return
      * @date 2020-09-30 下午3:17
      */
-    public void checkAndSetBuildConfig(AppOrchestration app) throws Exception {
+    public void checkAndSetBuildConfig(AppConfig app) throws Exception {
         BuildConfig buildConfig =
                 new BuildConfig(app.getRepoAuthConfig(), app.getCompilerConfig(), app.getPackerConfig());
         checkAndSetBuildConfig(buildConfig);
@@ -59,7 +59,7 @@ public class SharedEntityChecker {
         app.setPackerConfig(buildConfig.getPacker());
     }
 
-    public void checkAndSetBuildConfig(ProjOrchestration proj) throws Exception {
+    public void checkAndSetBuildConfig(ProjConfig proj) throws Exception {
         BuildConfig buildConfig =
                 new BuildConfig(proj.getRepoAuthConfig(), proj.getCompilerConfig(), proj.getPackerConfig());
         checkAndSetBuildConfig(buildConfig);

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

@@ -5,8 +5,8 @@ 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.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+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;
 import cn.reghao.autodop.dmaster.app.db.repository.config.build.CompilerConfigRepository;
 import org.springframework.stereotype.Service;
@@ -69,14 +69,14 @@ public class CompilerConfigCrudService {
     }
 
     public Result delete(CompilerConfig compilerConfig) {
-        List<AppOrchestration> apps = appQuery.findAllByCompilerConfig(compilerConfig);
-        List<ProjOrchestration> projs = projQuery.findAllByCompilerConfig(compilerConfig);
+        List<AppConfig> apps = appQuery.findAllByCompilerConfig(compilerConfig);
+        List<ProjConfig> projs = projQuery.findAllByCompilerConfig(compilerConfig);
         if (apps.isEmpty() && projs.isEmpty()) {
             compilerRepository.delete(compilerConfig);
             return Result.result(ResultStatus.SUCCESS);
         } else {
-            List<String> ids = apps.stream().map(AppOrchestration::getAppId).collect(Collectors.toList());
-            ids.addAll(projs.stream().map(ProjOrchestration::getProjId).collect(Collectors.toList()));
+            List<String> ids = apps.stream().map(AppConfig::getAppId).collect(Collectors.toList());
+            ids.addAll(projs.stream().map(ProjConfig::getProjId).collect(Collectors.toList()));
             String msg = compilerConfig.getName() + " 删除失败, " + ids.toString() + " 等应用正在使用";
             return Result.result(ResultStatus.FAIL, msg);
         }

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

@@ -4,8 +4,8 @@ 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.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+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;
 import cn.reghao.autodop.dmaster.app.db.repository.config.build.PackerConfigRepository;
 import org.springframework.stereotype.Service;
@@ -35,14 +35,14 @@ public class PackerConfigCrudService {
     }
 
     public Result delete(PackerConfig packerConfig) {
-        List<AppOrchestration> apps = appQuery.findAllByPackerConfig(packerConfig);
-        List<ProjOrchestration> projs = projQuery.findAllByPackerConfig(packerConfig);
+        List<AppConfig> apps = appQuery.findAllByPackerConfig(packerConfig);
+        List<ProjConfig> projs = projQuery.findAllByPackerConfig(packerConfig);
         if (apps.isEmpty() && projs.isEmpty()) {
             packerRepository.delete(packerConfig);
             return Result.result(ResultStatus.SUCCESS);
         } else {
-            List<String> ids = apps.stream().map(AppOrchestration::getAppId).collect(Collectors.toList());
-            ids.addAll(projs.stream().map(ProjOrchestration::getProjId).collect(Collectors.toList()));
+            List<String> ids = apps.stream().map(AppConfig::getAppId).collect(Collectors.toList());
+            ids.addAll(projs.stream().map(ProjConfig::getProjId).collect(Collectors.toList()));
             String msg = packerConfig.getName() + " 删除失败, " + ids.toString() + " 等应用正在使用";
             return Result.result(ResultStatus.FAIL, msg);
         }

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

@@ -6,8 +6,8 @@ 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.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+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;
 import cn.reghao.autodop.dmaster.app.db.repository.config.build.RepoAuthConfigRepository;
 import org.springframework.stereotype.Service;
@@ -71,14 +71,14 @@ public class RepoAuthConfigCrudService {
     }
 
     public Result delete(RepoAuthConfig repoAuthConfig) {
-        List<AppOrchestration> apps = appQuery.findAllByRepoAuthConfig(repoAuthConfig);
-        List<ProjOrchestration> projs = projQuery.findAllByRepoAuthConfig(repoAuthConfig);
+        List<AppConfig> apps = appQuery.findAllByRepoAuthConfig(repoAuthConfig);
+        List<ProjConfig> projs = projQuery.findAllByRepoAuthConfig(repoAuthConfig);
         if (apps.isEmpty() && projs.isEmpty()) {
             repoAuthRepository.delete(repoAuthConfig);
             return Result.result(ResultStatus.SUCCESS);
         } else {
-            List<String> ids = apps.stream().map(AppOrchestration::getAppId).collect(Collectors.toList());
-            ids.addAll(projs.stream().map(ProjOrchestration::getProjId).collect(Collectors.toList()));
+            List<String> ids = apps.stream().map(AppConfig::getAppId).collect(Collectors.toList());
+            ids.addAll(projs.stream().map(ProjConfig::getProjId).collect(Collectors.toList()));
             String msg = repoAuthConfig.getName() + " 删除失败, " + ids.toString() + " 等应用正在使用";
             return Result.result(ResultStatus.FAIL, msg);
         }

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

@@ -1,11 +1,11 @@
 package cn.reghao.autodop.dmaster.app.db.query;
 
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.jdkutil.db.BaseQuery;
 
 /**
  * @author reghao
  * @date 2021-09-16 18:31:24
  */
-public interface AppConfigQuery extends BaseQuery<AppOrchestration> {
+public interface AppConfigQuery extends BaseQuery<AppConfig> {
 }

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

@@ -1,10 +1,10 @@
 package cn.reghao.autodop.dmaster.app.db.query.config;
 
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.db.repository.config.AppOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.config.AppConfigRepository;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -23,14 +23,14 @@ import java.util.Map;
 @CacheConfig(cacheNames = {"caffeineCacheManager"})
 @Service
 public class AppQuery {
-    private AppOrchestrationRepository appRepository;
+    private AppConfigRepository appRepository;
 
-    public AppQuery(AppOrchestrationRepository appRepository) {
+    public AppQuery(AppConfigRepository appRepository) {
         this.appRepository = appRepository;
     }
 
-    public List<AppOrchestration> query(Map<String, String> kv) {
-        Specification<AppOrchestration> specification = (root, query, cb) -> {
+    public List<AppConfig> query(Map<String, String> kv) {
+        Specification<AppConfig> specification = (root, query, cb) -> {
             List<Predicate> predicates = new ArrayList<>();
             kv.forEach((name, value) -> {
                 predicates.add(cb.like(root.get(name), "%" + value + "%"));
@@ -43,33 +43,33 @@ public class AppQuery {
     }
 
     //@Cacheable(cacheNames = {"app"}, key = "#appId")
-    public AppOrchestration findByAppId(String appId) {
+    public AppConfig findByAppId(String appId) {
         return appRepository.findByIsDeleteFalseAndAppId(appId);
     }
 
     //@Cacheable(cacheNames = {"app"}, key = "#appId")
-    public AppOrchestration findByIsDeleteFalseAndAppId(String appId) {
+    public AppConfig findByIsDeleteFalseAndAppId(String appId) {
         return appRepository.findByIsDeleteFalseAndAppId(appId);
     }
 
     //@Cacheable(cacheNames = {"apps"}, key = "T(String).valueOf(#pageable.pageNumber).concat('-').concat(#pageable.pageSize).concat('-').concat(#env)")
-    public Page<AppOrchestration> findByEnv(String env, Pageable pageable) {
+    public Page<AppConfig> findByEnv(String env, Pageable pageable) {
         return appRepository.findByEnv(env, pageable);
     }
 
-    public List<AppOrchestration> findAll() {
+    public List<AppConfig> findAll() {
         return appRepository.findAll();
     }
 
-    public List<AppOrchestration> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig) {
+    public List<AppConfig> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig) {
         return appRepository.findAllByRepoAuthConfig(repoAuthConfig);
     }
 
-    public List<AppOrchestration> findAllByCompilerConfig(CompilerConfig compilerConfig) {
+    public List<AppConfig> findAllByCompilerConfig(CompilerConfig compilerConfig) {
         return appRepository.findAllByCompilerConfig(compilerConfig);
     }
 
-    public List<AppOrchestration> findAllByPackerConfig(PackerConfig packerConfig) {
+    public List<AppConfig> findAllByPackerConfig(PackerConfig packerConfig) {
         return appRepository.findAllByPackerConfig(packerConfig);
     }
 }

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

@@ -1,10 +1,10 @@
 package cn.reghao.autodop.dmaster.app.db.query.config;
 
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.db.repository.config.ProjOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.config.ProjConfigRepository;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -23,14 +23,14 @@ import java.util.Map;
 @CacheConfig(cacheNames = {"caffeineCacheManager"})
 @Service
 public class ProjQuery {
-    private ProjOrchestrationRepository projRepository;
+    private ProjConfigRepository projRepository;
 
-    public ProjQuery(ProjOrchestrationRepository projRepository) {
+    public ProjQuery(ProjConfigRepository projRepository) {
         this.projRepository = projRepository;
     }
 
-    public List<ProjOrchestration> queryAll(Map<String, String> kv) {
-        Specification<ProjOrchestration> specification = (root, query, cb) -> {
+    public List<ProjConfig> queryAll(Map<String, String> kv) {
+        Specification<ProjConfig> specification = (root, query, cb) -> {
             List<Predicate> predicates = new ArrayList<>();
             kv.forEach((name, value) -> {
                 predicates.add(cb.equal(root.get(name), value));
@@ -40,8 +40,8 @@ public class ProjQuery {
        return projRepository.findAll(specification);
     }
 
-    public ProjOrchestration query(Map<String, String> kv) {
-        Specification<ProjOrchestration> specification = (root, query, cb) -> {
+    public ProjConfig query(Map<String, String> kv) {
+        Specification<ProjConfig> specification = (root, query, cb) -> {
             List<Predicate> predicates = new ArrayList<>();
             kv.forEach((name, value) -> {
                 predicates.add(cb.equal(root.get(name), value));
@@ -49,28 +49,28 @@ public class ProjQuery {
             return cb.and(predicates.toArray(new Predicate[0]));
         };
 
-        List<ProjOrchestration> list = projRepository.findAll(specification);
+        List<ProjConfig> list = projRepository.findAll(specification);
         return list.get(0);
     }
 
     //@Cacheable(cacheNames = {"projs"}, keyGenerator = "projKeyGenerator")
-    public ProjOrchestration findByIsDeleteFalseAndProjId(String projId) {
+    public ProjConfig findByIsDeleteFalseAndProjId(String projId) {
         return projRepository.findByIsDeleteFalseAndProjId(projId);
     }
 
-    public Page<ProjOrchestration> findByIsDeleteFalse(Pageable pageable) {
+    public Page<ProjConfig> findByIsDeleteFalse(Pageable pageable) {
         return projRepository.findByIsDeleteFalse(pageable);
     }
 
-    public List<ProjOrchestration> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig) {
+    public List<ProjConfig> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig) {
         return projRepository.findAllByRepoAuthConfig(repoAuthConfig);
     }
 
-    public List<ProjOrchestration> findAllByCompilerConfig(CompilerConfig compilerConfig) {
+    public List<ProjConfig> findAllByCompilerConfig(CompilerConfig compilerConfig) {
         return projRepository.findAllByCompilerConfig(compilerConfig);
     }
 
-    public List<ProjOrchestration> findAllByPackerConfig(PackerConfig packerConfig) {
+    public List<ProjConfig> findAllByPackerConfig(PackerConfig packerConfig) {
         return projRepository.findAllByPackerConfig(packerConfig);
     }
 }

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

@@ -0,0 +1,29 @@
+package cn.reghao.autodop.dmaster.app.db.repository.config;
+
+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;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+/**
+ *
+ * @author reghao
+ * @date 2020-01-21 14:53:03
+ */
+public interface AppConfigRepository extends JpaRepository<AppConfig, Integer>, JpaSpecificationExecutor<AppConfig> {
+    AppConfig findByAppId(String appId);
+    AppConfig findByIsDeleteFalseAndAppId(String appId);
+    Page<AppConfig> findByEnv(String env, Pageable pageable);
+
+    List<AppConfig> findAllByProj(ProjConfig proj);
+    List<AppConfig> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig);
+    List<AppConfig> findAllByCompilerConfig(CompilerConfig compilerConfig);
+    List<AppConfig> findAllByPackerConfig(PackerConfig packerConfig);
+}

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

@@ -1,30 +0,0 @@
-package cn.reghao.autodop.dmaster.app.db.repository.config;
-
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-import java.util.List;
-
-/**
- *
- * @author reghao
- * @date 2020-01-21 14:53:03
- */
-public interface AppOrchestrationRepository
-        extends JpaRepository<AppOrchestration, Integer>, JpaSpecificationExecutor<AppOrchestration> {
-    AppOrchestration findByAppId(String appId);
-    AppOrchestration findByIsDeleteFalseAndAppId(String appId);
-    Page<AppOrchestration> findByEnv(String env, Pageable pageable);
-
-    List<AppOrchestration> findAllByProj(ProjOrchestration proj);
-    List<AppOrchestration> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig);
-    List<AppOrchestration> findAllByCompilerConfig(CompilerConfig compilerConfig);
-    List<AppOrchestration> findAllByPackerConfig(PackerConfig packerConfig);
-}

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

@@ -0,0 +1,25 @@
+package cn.reghao.autodop.dmaster.app.db.repository.config;
+
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+/**
+ *
+ * @author reghao
+ * @date 2020-01-21 14:53:03
+ */
+public interface ProjConfigRepository extends JpaRepository<ProjConfig, Integer>, JpaSpecificationExecutor<ProjConfig> {
+    ProjConfig findByIsDeleteFalseAndProjId(String projId);
+    Page<ProjConfig> findByIsDeleteFalse(Pageable pageable);
+    List<ProjConfig> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig);
+    List<ProjConfig> findAllByCompilerConfig(CompilerConfig compilerConfig);
+    List<ProjConfig> findAllByPackerConfig(PackerConfig packerConfig);
+}

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

@@ -1,27 +0,0 @@
-package cn.reghao.autodop.dmaster.app.db.repository.config;
-
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-import java.util.List;
-
-/**
- *
- * @author reghao
- * @date 2020-01-21 14:53:03
- */
-public interface ProjOrchestrationRepository
-        extends JpaRepository<ProjOrchestration, Integer>, JpaSpecificationExecutor<ProjOrchestration> {
-    ProjOrchestration findByIsDeleteFalseAndProjId(String projId);
-
-    Page<ProjOrchestration> findByIsDeleteFalse(Pageable pageable);
-    List<ProjOrchestration> findAllByRepoAuthConfig(RepoAuthConfig repoAuthConfig);
-    List<ProjOrchestration> findAllByCompilerConfig(CompilerConfig compilerConfig);
-    List<ProjOrchestration> findAllByPackerConfig(PackerConfig packerConfig);
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/dto/DeployConfigs.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.model.dto;
 
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import lombok.Data;
 
 import javax.validation.Valid;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/AppBuilding.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.model.po;
 
 import cn.reghao.jdkutil.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.RunningConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.RunningConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
@@ -38,7 +38,7 @@ public class AppBuilding extends BaseEntity<Integer> {
     private String packagePath;
     private String buildBy;
 
-    public AppBuilding(AppOrchestration app) {
+    public AppBuilding(AppConfig app) {
         this.appId = app.getAppId();
         this.appName = app.getAppName();
         this.env = app.getEnv();
@@ -52,7 +52,7 @@ public class AppBuilding extends BaseEntity<Integer> {
         }
     }
 
-    public AppBuilding refresh(AppOrchestration app) {
+    public AppBuilding refresh(AppConfig app) {
         this.appName = app.getAppName();
         this.env = app.getEnv();
         this.appType = app.getAppType();

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/AppDeploying.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.model.po;
 
 import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,7 +27,7 @@ public class AppDeploying extends AppProperty {
     private String deployResult;
     private String deployBy;
 
-    public AppDeploying(AppOrchestration app, DeployConfig deployConfig) {
+    public AppDeploying(AppConfig app, DeployConfig deployConfig) {
         super(app, deployConfig);
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/AppProperty.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.model.po;
 
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,7 +27,7 @@ public class AppProperty extends BaseEntity<Integer> {
     private String machineId;
     private String machineIpv4;
 
-    public AppProperty(AppOrchestration app, DeployConfig deployConfig) {
+    public AppProperty(AppConfig app, DeployConfig deployConfig) {
         this.appId = app.getAppId();
         this.appName = app.getAppName();
         this.appType = app.getAppType();

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/AppRunning.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.model.po;
 
 import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,13 +29,13 @@ public class AppRunning extends AppProperty {
     private Integer pid;
     private LocalDateTime lastCheck;
 
-    public AppRunning(AppOrchestration app, DeployConfig deployConfig) {
+    public AppRunning(AppConfig app, DeployConfig deployConfig) {
         super(app, deployConfig);
         this.httpPort = app.getRunningConfig().getHttpPort();
         this.healthCheck = app.getRunningConfig().getHealthCheck();
     }
 
-    public AppRunning update(AppOrchestration app, String machineIpv4) {
+    public AppRunning update(AppConfig app, String machineIpv4) {
         this.update0(app.getAppName(), machineIpv4);
         this.httpPort = app.getRunningConfig().getHttpPort();
         this.healthCheck = app.getRunningConfig().getHealthCheck();

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/AppOrchestration.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/AppConfig.java

@@ -4,8 +4,6 @@ import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.RunningConfig;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,7 +23,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Entity
-public class AppOrchestration extends BaseEntity<Integer> implements Cloneable {
+public class AppConfig extends BaseEntity<Integer> implements Cloneable {
     @Column(nullable = false, unique = true)
     @NotNull(message = "应用 ID 不能为 NULL")
     @Length(min = 4, max = 16, message = "应用 ID 长度为 4 ～ 16 个字符")
@@ -64,7 +62,7 @@ public class AppOrchestration extends BaseEntity<Integer> implements Cloneable {
     // buildConfig 和 projId 二者只能存在一个
     @ManyToOne(cascade = CascadeType.REFRESH)
     @JoinColumn(name = "proj_config_id", foreignKey = @ForeignKey(value = ConstraintMode.NO_CONSTRAINT))
-    private ProjOrchestration proj;
+    private ProjConfig proj;
     // buildConfig
     @ManyToOne(cascade = CascadeType.REFRESH)
     @JoinColumn(name = "repo_auth_config_id", foreignKey = @ForeignKey(value = ConstraintMode.NO_CONSTRAINT))

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/deploy/DeployConfig.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/DeployConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.model.po.config.deploy;
+package cn.reghao.autodop.dmaster.app.model.po.config;
 
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/deploy/LogConfig.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/LogConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.model.po.config.deploy;
+package cn.reghao.autodop.dmaster.app.model.po.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/ProjOrchestration.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/ProjConfig.java

@@ -19,7 +19,7 @@ import javax.validation.constraints.NotBlank;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Entity
-public class ProjOrchestration extends BaseEntity<Integer> implements Cloneable {
+public class ProjConfig extends BaseEntity<Integer> implements Cloneable {
     @Column(nullable = false, unique = true)
     @NotBlank(message = "项目 ID 不能为空白字符串")
     private String projId;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/deploy/RunningConfig.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/RunningConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.model.po.config.deploy;
+package cn.reghao.autodop.dmaster.app.model.po.config;
 
 import lombok.Data;
 

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.model.po.log;
 
 import cn.reghao.jdkutil.result.Result;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
 import cn.reghao.autodop.dmaster.app.model.vo.BuildConfig;
 import cn.reghao.autodop.dmaster.rbac.UserContext;
@@ -33,7 +33,7 @@ public class BuildLog extends BaseDocument {
     private Result result;
     private String buildBy;
 
-    public static BuildLog from(AppOrchestration app) {
+    public static BuildLog from(AppConfig app) {
         BuildLog buildLog = new BuildLog();
         buildLog.setAppId(app.getAppId());
         buildLog.setAppType(app.getAppType());

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/vo/NewApp.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.model.vo;
 
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -20,7 +20,7 @@ public class NewApp {
     @NotBlank(message = "应用环境不能为空白字符串")
     private String env;
 
-    public AppOrchestration app(AppOrchestration from) {
+    public AppConfig app(AppConfig from) {
         from.setAppId(newId);
         from.setRepoBranch(newRepoBranch);
         from.setEnv(env);
@@ -33,7 +33,7 @@ public class NewApp {
         return from;
     }
 
-    public ProjOrchestration proj(ProjOrchestration from) {
+    public ProjConfig proj(ProjConfig from) {
         from.setProjId(newId);
         from.setRepoBranch(newRepoBranch);
         from.setEnv(env);

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

@@ -4,7 +4,7 @@ import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 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;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.db.repository.AppBuildingRepository;
 import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
 import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
@@ -38,20 +38,20 @@ public class AppBuildDeployService {
 
     // TODO 启用 env 和 appType 字段，根据环境和应用类型来刷新，避免一次刷新过多应用
     public void refresh() {
-        List<AppOrchestration> apps = appQuery.findAll();
-        Set<String> appIds = apps.stream().map(AppOrchestration::getAppId).collect(Collectors.toSet());
+        List<AppConfig> apps = appQuery.findAll();
+        Set<String> appIds = apps.stream().map(AppConfig::getAppId).collect(Collectors.toSet());
 
         refreshAppBuilding(apps, appIds);
         refreshAppDeployingAndRunning(apps, appIds);
     }
 
-    public void refreshApp(AppOrchestration app) {
+    public void refreshApp(AppConfig app) {
         refreshAppBuilding(app);
         refreshAppDeploying(app);
         refreshAppRunning(app);
     }
 
-    public void refreshAppBuilding(List<AppOrchestration> apps, Set<String> appIds) {
+    public void refreshAppBuilding(List<AppConfig> apps, Set<String> appIds) {
         Set<String> appsToDelete = buildingRepository.findAll().stream()
                 .map(appBuilding -> {
                     String appId = appBuilding.getAppId();
@@ -70,7 +70,7 @@ public class AppBuildDeployService {
      * @return
      * @date 2021-06-18 下午5:24
      */
-    private void refreshAppBuilding(AppOrchestration app) {
+    private void refreshAppBuilding(AppConfig app) {
         AppBuilding appBuilding = buildingRepository.findByAppId(app.getAppId());
         if (appBuilding == null) {
             appBuilding = new AppBuilding(app);
@@ -80,7 +80,7 @@ public class AppBuildDeployService {
         buildingRepository.save(appBuilding);
     }
 
-    public void refreshAppDeployingAndRunning(List<AppOrchestration> apps, Set<String> appIds) {
+    public void refreshAppDeployingAndRunning(List<AppConfig> apps, Set<String> appIds) {
         Set<String> appsToDelete = deployingRepository.findAll().stream()
                 .map(appDeploying -> {
                     String appId = appDeploying.getAppId();
@@ -98,7 +98,7 @@ public class AppBuildDeployService {
                 .collect(Collectors.toSet());
 
         // 配置了 DeployConfig 的应用
-        List<AppOrchestration> appsWithDeployConfig = apps.stream()
+        List<AppConfig> appsWithDeployConfig = apps.stream()
                 .filter(app -> !app.getDeployConfigs().isEmpty())
                 // TODO 使用 peek
                 //.peek()
@@ -115,7 +115,7 @@ public class AppBuildDeployService {
      * @return
      * @date 2021-06-18 下午5:25
      */
-    private void refreshAppDeploying(AppOrchestration app) {
+    private void refreshAppDeploying(AppConfig app) {
         String appId = app.getAppId();
         List<AppDeploying> list = app.getDeployConfigs().stream()
                 .map(deployConfig -> {
@@ -139,7 +139,7 @@ public class AppBuildDeployService {
      * @return
      * @date 2021-06-18 下午5:29
      */
-    private void refreshAppRunning(AppOrchestration app) {
+    private void refreshAppRunning(AppConfig app) {
         String appId = app.getAppId();
         List<AppRunning> list = app.getDeployConfigs().stream()
                 .map(deployConfig -> {

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

@@ -7,7 +7,7 @@ import cn.reghao.autodop.common.http.WebRequest;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 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.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.model.po.log.DeployLog;
 import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
@@ -97,7 +97,7 @@ public class AppOpsResultService {
     }
 
     private void deployNotify(BuildLog buildLog, DeployResult deployResult) {
-        AppOrchestration app = appQuery.findByAppId(buildLog.getAppId());
+        AppConfig app = appQuery.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

@@ -9,7 +9,7 @@ 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.model.po.AppRunning;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -37,7 +37,7 @@ public class AppStatusService {
     }
 
     public void changeStatus(String appId, String machineId, StatusOps statusOps) {
-        AppOrchestration app = appQuery.findByAppId(appId);
+        AppConfig app = appQuery.findByAppId(appId);
         switch (statusOps) {
             case restart:
                 setAppStatus(app, machineId, AppOps.appRestart);
@@ -53,7 +53,7 @@ public class AppStatusService {
         }
     }
 
-    private void setAppStatus(AppOrchestration app, String machineId, AppOps appOps) {
+    private void setAppStatus(AppConfig app, String machineId, AppOps appOps) {
         AppIdParam appIdParam = new AppIdParam(app.getPackerConfig().getType(), app.getAppId());
         AsyncMsg asyncMsg = new AsyncMsg();
         asyncMsg.setMachineId(machineId);
@@ -74,7 +74,7 @@ public class AppStatusService {
         List<AppRunning> appRunnings = runningRepository.findAll();
         appRunnings.forEach(appRunning -> {
             String appId = appRunning.getAppId();
-            AppOrchestration app = appQuery.findByAppId(appId);
+            AppConfig app = appQuery.findByAppId(appId);
             String machineId = appRunning.getMachineId();
             getStatus(app, machineId);
         });
@@ -86,12 +86,12 @@ public class AppStatusService {
 
     public void refreshAppStatus(AppRunning appRunning) {
         String appId = appRunning.getAppId();
-        AppOrchestration app = appQuery.findByAppId(appId);
+        AppConfig app = appQuery.findByAppId(appId);
         String machineId = appRunning.getMachineId();
         getStatus(app, machineId);
     }
 
-    public void getStatus(AppOrchestration app, String machineId) {
+    public void getStatus(AppConfig app, String machineId) {
         AppIdParam appIdParam = new AppIdParam(app.getPackerConfig().getType(), app.getAppId());
         AsyncMsg asyncMsg = new AsyncMsg();
         asyncMsg.setMachineId(machineId);
@@ -116,7 +116,7 @@ public class AppStatusService {
      * @date 2021-02-26 上午8:23
      */
     public List<LogFile> logFiles(String appId, String machineId) {
-        AppOrchestration app = appQuery.findByAppId(appId);
+        AppConfig app = appQuery.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) {
-        AppOrchestration app = appQuery.findByAppId(appId);
+        AppConfig app = appQuery.findByAppId(appId);
         return null;
     }
 

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

@@ -11,7 +11,7 @@ import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
 import cn.reghao.autodop.dmaster.app.db.repository.log.BuildLogRepository;
 import cn.reghao.autodop.dmaster.app.service.bd.AppIntegrate;
 import cn.reghao.autodop.dmaster.app.service.bd.AppDeployer;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.service.bd.BuildNotifyMsg;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyType;
@@ -88,7 +88,7 @@ public class BuildDeployDispatcher {
             integrateMap.put(appId, appIntegrate);
         }*/
 
-        AppOrchestration app = appQuery.findByAppId(appId);
+        AppConfig app = appQuery.findByAppId(appId);
         if (app == null) {
             onBuilding.remove(appId);
             throw new Exception(appId + " 不存在...");

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

@@ -1,29 +0,0 @@
-package cn.reghao.autodop.dmaster.app.service;
-
-import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.SvnImpl;
-import cn.reghao.autodop.dmaster.util.AliOss;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.tmatesoft.svn.core.SVNException;
-
-/**
- * @author reghao
- * @date 2020-03-17 13:58:03
- */
-@Slf4j
-@Service
-public class OssService {
-    private AliOss aliOss;
-
-    public OssService(AliOss aliOss) {
-        this.aliOss = aliOss;
-    }
-
-    public void upload(String dirname) throws SVNException {
-        SvnImpl svn = new SvnImpl("gjs", "gjs1234");
-        String remote = "svn://192.168.0.214/azy/CodeRepositories/IQuizoo.C2Game/trunk/Codes/" + dirname;
-        /*String local = SysConfig.localRepos + "/c2game/" + dirname;
-        svn.update(remote, local);
-        ossUtil.backupAndUpload(dirname, local);*/
-    }
-}

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

@@ -7,7 +7,7 @@ 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.model.po.config.deploy.DeployConfig;
+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;
 import org.eclipse.paho.client.mqttv3.MqttException;

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

@@ -6,8 +6,8 @@ import cn.reghao.autodop.dmaster.app.model.constant.build.RepoType;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+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.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;
@@ -37,7 +37,7 @@ public class AppIntegrate {
     // TODO 应用二进制文件存储到本地时使用
     private String appPackDir;
 
-    private AppOrchestration app;
+    private AppConfig app;
     // 远程仓库最近一次提交的信息
     private CommitInfo latestCommitInfo;
 
@@ -45,12 +45,12 @@ public class AppIntegrate {
     private CodeCompiler codeCompiler;
     private CodePacker codePacker;
 
-    public AppIntegrate(AppOrchestration app) {
+    public AppIntegrate(AppConfig app) {
         this.app = app;
         init();
     }
 
-    public AppOrchestration app() {
+    public AppConfig app() {
         return app;
     }
 
@@ -61,7 +61,7 @@ public class AppIntegrate {
      * @return
      * @date 2020-08-06 上午10:39
      */
-    public void reInit(AppOrchestration app) {
+    public void reInit(AppConfig app) {
         this.app = app;
         init();
     }
@@ -132,8 +132,8 @@ public class AppIntegrate {
         }
     }
 
-    private void checkProj(AppOrchestration app) {
-        ProjOrchestration proj = app.getProj();
+    private void checkProj(AppConfig app) {
+        ProjConfig proj = app.getProj();
         if (proj == null) {
             return;
         }
@@ -148,7 +148,7 @@ public class AppIntegrate {
         String branch;
         // TODO 区分 GIT 和 SVN pull 代码时的不同
         String local = appLocalRepo;
-        ProjOrchestration proj = app.getProj();
+        ProjConfig proj = app.getProj();
         if (proj != null) {
             remote = proj.getProjRepo();
             branch = app.getRepoBranch();

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

@@ -3,8 +3,8 @@ package cn.reghao.autodop.dmaster.app.service.bd;
 import cn.reghao.autodop.common.util.FileOps;
 import cn.reghao.autodop.common.util.text.ReplaceCharacter;
 import cn.reghao.autodop.dmaster.app.model.constant.AppType;
-import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+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.BuildDirLocal;
 import lombok.extern.slf4j.Slf4j;
 
@@ -23,7 +23,7 @@ public class BuilderUtil {
      * @param appLocalRepo 应用代码的本地仓库位置
      * @date 2019-12-03 上午9:55
      */
-    public static void copyToCompileDir(String appLocalRepo, AppOrchestration app) throws IOException {
+    public static void copyToCompileDir(String appLocalRepo, AppConfig app) throws IOException {
         String appCompileDir = BuildDirLocal.compileDir + "/" + app.getAppId();
         File compileDir = new File(appCompileDir);
         if (!compileDir.exists() && !FileOps.mkdirs(compileDir)) {
@@ -32,7 +32,7 @@ public class BuilderUtil {
             FileOps.eraseDir(compileDir);
         }
 
-        ProjOrchestration proj = app.getProj();
+        ProjConfig proj = app.getProj();
         String dirname;
         if (proj != null) {
             dirname = proj.getCodeDirname();

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

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.app.service;
+package cn.reghao.autodop.dmaster.app.service.config;
 
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.app.service;
+package cn.reghao.autodop.dmaster.app.service.config;
 
 import cn.reghao.autodop.dmaster.app.db.crud.config.AppConfigCrud;
-import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

@@ -0,0 +1,8 @@
+package cn.reghao.autodop.dmaster.app.service.config;
+
+/**
+ * @author reghao
+ * @date 2021-09-17 10:16:07
+ */
+public interface BuildConfigService {
+}

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

@@ -0,0 +1,8 @@
+package cn.reghao.autodop.dmaster.app.service.config;
+
+/**
+ * @author reghao
+ * @date 2021-09-17 10:13:46
+ */
+public interface ProjConfigService {
+}

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

@@ -29,7 +29,7 @@ public class MonitorScheduler {
 
     public MonitorScheduler(MonitorJobRepository monitorJobRepository, MonitorJobData monitorJobData)
             throws SchedulerException {
-        this.scheduler = StdSchedulerFactory.getDefaultScheduler();
+        //this.scheduler = StdSchedulerFactory.getDefaultScheduler();
         this.monitorJobRepository = monitorJobRepository;
         this.packageScanner = new PackageScanner();
         this.monitorJobData = monitorJobData;
@@ -44,8 +44,8 @@ public class MonitorScheduler {
      */
     @PostConstruct
     public void startScheduler() throws SchedulerException, IOException {
-        startAllJobs();
-        scheduler.start();
+        //startAllJobs();
+        //scheduler.start();
     }
 
     private void startAllJobs() throws SchedulerException, IOException {