将构建配置相关的接口和实现抽离出来放到 web.devops.builds 包中

web/src/main/java/cn/reghao/bnt/web/config/spring/AppLifecycle.java

@@ -2,11 +2,11 @@ package cn.reghao.bnt.web.config.spring;
 
 import cn.reghao.bnt.web.account.service.AccountService;
 import cn.reghao.bnt.web.config.AppProperties;
-import cn.reghao.bnt.web.devops.app.service.config.BuildDirService;
+import cn.reghao.bnt.web.devops.builds.service.BuildDirService;
 import cn.reghao.bnt.web.devops.machine.service.MachineService;
 import cn.reghao.bnt.web.account.service.RoleService;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.CompilerConfigRepository;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.db.repository.CompilerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
 import cn.reghao.bnt.web.devops.app.service.bd.BuildStat;
 import cn.reghao.bnt.web.ws.handler.LogHandler;
 import cn.reghao.bnt.web.devops.build.model.constant.CompileType;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/DockerRegistryPageController.java

@@ -1,10 +1,7 @@
 package cn.reghao.bnt.web.devops.app.controller.page;
 
-import cn.reghao.bnt.web.devops.app.db.repository.DockerRegistryRepository;
-import cn.reghao.bnt.web.devops.app.model.po.DockerRegistry;
-import cn.reghao.bnt.web.devops.app.model.vo.KeyValue;
-import cn.reghao.bnt.web.devops.build.model.constant.RepoAuthType;
-import cn.reghao.bnt.web.devops.build.model.constant.RepoType;
+import cn.reghao.bnt.web.devops.builds.db.repository.DockerRegistryRepository;
+import cn.reghao.bnt.web.devops.builds.model.po.DockerRegistry;
 import cn.reghao.bnt.web.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,9 +13,6 @@ 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 2024-07-26 17:36:37

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/AppConfigPageController.java

@@ -1,9 +1,9 @@
 package cn.reghao.bnt.web.devops.app.controller.page.config;
 
 import cn.reghao.bnt.web.devops.app.db.query.AppConfigQuery;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.CompilerConfigRepository;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.PackerConfigRepository;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.RepoAuthConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.CompilerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.PackerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.RepoAuthConfigRepository;
 import cn.reghao.bnt.web.devops.app.model.constant.AppType;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.AppConfigVO;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/BuildDirPageController.java

@@ -1,8 +1,8 @@
 package cn.reghao.bnt.web.devops.app.controller.page.config;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.BuildDir;
+import cn.reghao.bnt.web.devops.builds.model.po.BuildDir;
 import cn.reghao.bnt.web.util.db.PageSort;
-import cn.reghao.bnt.web.devops.app.service.config.BuildDirService;
+import cn.reghao.bnt.web.devops.builds.service.BuildDirService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/CompilerPageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.app.controller.page.config;
 
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.CompilerConfigRepository;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.db.repository.CompilerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.KeyValue;
 import cn.reghao.bnt.web.devops.build.model.constant.CompileType;
 import cn.reghao.bnt.web.util.db.PageSort;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/PackerPageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.app.controller.page.config;
 
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.PackerConfigRepository;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.db.repository.PackerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.KeyValue;
 import cn.reghao.bnt.web.util.db.PageSort;
 import cn.reghao.bnt.common.machine.Machine;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/RepoAuthPageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.app.controller.page.config;
 
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.RepoAuthConfigRepository;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.db.repository.RepoAuthConfigRepository;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.KeyValue;
 import cn.reghao.bnt.web.devops.build.model.constant.RepoAuthType;
 import cn.reghao.bnt.web.devops.build.model.constant.RepoType;

web/src/main/java/cn/reghao/bnt/web/devops/app/db/query/AppConfigQuery.java

@@ -1,9 +1,9 @@
 package cn.reghao.bnt.web.devops.app.db.query;
 
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.AppConfigVO;
 import cn.reghao.jutil.jdk.db.BaseQuery;
 import org.springframework.data.domain.Page;

web/src/main/java/cn/reghao/bnt/web/devops/app/db/query/impl/AppConfigQueryImpl.java

@@ -4,9 +4,9 @@ import cn.reghao.bnt.web.devops.app.db.query.AppConfigQuery;
 import cn.reghao.bnt.web.devops.app.db.repository.config.AppConfigRepository;
 import cn.reghao.bnt.web.devops.app.db.repository.config.AppDeployConfigRepository;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.bnt.web.devops.app.model.vo.AppConfigVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;

web/src/main/java/cn/reghao/bnt/web/devops/app/db/repository/config/AppConfigRepository.java

@@ -1,9 +1,9 @@
 package cn.reghao.bnt.web.devops.app.db.repository.config;
 
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/AppConfig.java

@@ -3,12 +3,12 @@ package cn.reghao.bnt.web.devops.app.model.po.config;
 import cn.reghao.bnt.web.devops.app.model.constant.AppType;
 import cn.reghao.bnt.web.devops.app.model.dto.AppConfigDto;
 import cn.reghao.bnt.web.devops.app.model.dto.AppConfigUpdateDto;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
-import cn.reghao.bnt.web.devops.app.model.vo.BuildConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.vo.BuildConfig;
 import cn.reghao.bnt.web.devops.build.model.AppDto;
 import cn.reghao.bnt.web.devops.build.model.BuildConfigDto;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.bnt.web.util.db.BaseEntity;
 import cn.reghao.bnt.web.util.validator.ValidEnum;
 import lombok.Getter;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/impl/DeployAppImpl.java

@@ -5,7 +5,7 @@ import cn.reghao.bnt.common.msg.constant.PackType;
 import cn.reghao.bnt.web.devops.app.db.query.AppDeployConfigQuery;
 import cn.reghao.bnt.web.devops.app.db.repository.log.BuildLogRepository;
 import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
-import cn.reghao.bnt.web.devops.app.model.po.DockerRegistry;
+import cn.reghao.bnt.web.devops.builds.model.po.DockerRegistry;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppDeployConfig;
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildLog;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/impl/AppConfigServiceImpl.java

@@ -5,7 +5,7 @@ import cn.reghao.bnt.web.devops.app.model.dto.AppConfigDto;
 import cn.reghao.bnt.web.devops.app.model.dto.AppConfigUpdateDto;
 import cn.reghao.bnt.web.devops.app.model.dto.CopyAppDto;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
-import cn.reghao.bnt.web.devops.app.model.vo.BuildConfig;
+import cn.reghao.bnt.web.devops.builds.model.vo.BuildConfig;
 import cn.reghao.bnt.web.devops.app.service.bd.BuildLogService;
 import cn.reghao.bnt.web.devops.app.service.bd.BuildStat;
 import cn.reghao.bnt.web.devops.build.chain.BuildTools;
@@ -13,6 +13,7 @@ import cn.reghao.bnt.web.devops.build.model.LocalBuildDir;
 import cn.reghao.bnt.web.devops.build.model.constant.RepoType;
 import cn.reghao.bnt.web.devops.app.service.config.AppConfigService;
 import cn.reghao.bnt.web.devops.app.service.config.AppDeployConfigService;
+import cn.reghao.bnt.web.devops.builds.service.impl.BuildConfigChecker;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import org.apache.commons.io.FileUtils;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/DockerRegistryController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/DockerRegistryController.java

@@ -1,7 +1,7 @@
-package cn.reghao.bnt.web.devops.app.controller;
+package cn.reghao.bnt.web.devops.builds.controller;
 
 import cn.reghao.bnt.common.docker.po.DockerAuth;
-import cn.reghao.bnt.web.devops.app.service.DockerRegistryService;
+import cn.reghao.bnt.web.devops.builds.service.DockerRegistryService;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/config/BuildDirController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/BuildDirController.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.controller.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
-import cn.reghao.bnt.web.devops.app.service.config.BuildDirService;
+import cn.reghao.bnt.web.devops.builds.service.BuildDirService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/config/CompilerConfigController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/CompilerConfigController.java

@@ -1,7 +1,7 @@
-package cn.reghao.bnt.web.devops.app.controller.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
-import cn.reghao.bnt.web.devops.app.service.config.CompilerConfigService;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.service.CompilerConfigService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/config/PackerConfigController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/PackerConfigController.java

@@ -1,7 +1,7 @@
-package cn.reghao.bnt.web.devops.app.controller.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
-import cn.reghao.bnt.web.devops.app.service.config.PackerConfigService;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.service.PackerConfigService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/config/RepoAuthConfigController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/RepoAuthConfigController.java

@@ -1,7 +1,7 @@
-package cn.reghao.bnt.web.devops.app.controller.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
-import cn.reghao.bnt.web.devops.app.service.config.RepoAuthConfigService;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.service.RepoAuthConfigService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;

web/src/main/java/cn/reghao/bnt/web/devops/app/db/repository/config/build/CompilerConfigRepository.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/db/repository/CompilerConfigRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.db.repository.config.build;
+package cn.reghao.bnt.web.devops.builds.db.repository;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/db/repository/DockerRegistryRepository.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/db/repository/DockerRegistryRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.db.repository;
+package cn.reghao.bnt.web.devops.builds.db.repository;
 
-import cn.reghao.bnt.web.devops.app.model.po.DockerRegistry;
+import cn.reghao.bnt.web.devops.builds.model.po.DockerRegistry;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/db/repository/config/build/PackerConfigRepository.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/db/repository/PackerConfigRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.db.repository.config.build;
+package cn.reghao.bnt.web.devops.builds.db.repository;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/db/repository/config/build/RepoAuthConfigRepository.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/db/repository/RepoAuthConfigRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.db.repository.config.build;
+package cn.reghao.bnt.web.devops.builds.db.repository;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/model/constant/build/CompileType.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/constant/CompileType.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.constant.build;
+package cn.reghao.bnt.web.devops.builds.model.constant;
 
 /**
  * 编译方式类型

web/src/main/java/cn/reghao/bnt/web/devops/app/model/constant/build/RepoAuthType.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/constant/RepoAuthType.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.constant.build;
+package cn.reghao.bnt.web.devops.builds.model.constant;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/model/constant/build/RepoType.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/constant/RepoType.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.constant.build;
+package cn.reghao.bnt.web.devops.builds.model.constant;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/build/BuildDir.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/po/BuildDir.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.po.config.build;
+package cn.reghao.bnt.web.devops.builds.model.po;
 
 import lombok.*;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/build/CompilerConfig.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/po/CompilerConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.po.config.build;
+package cn.reghao.bnt.web.devops.builds.model.po;
 
 import cn.reghao.bnt.web.devops.build.model.CompilerDto;
 import cn.reghao.bnt.web.devops.build.model.constant.CompileType;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/DockerRegistry.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/po/DockerRegistry.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.po;
+package cn.reghao.bnt.web.devops.builds.model.po;
 
 import cn.reghao.bnt.common.docker.po.DockerAuth;
 import cn.reghao.bnt.web.util.db.BaseEntity;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/build/PackerConfig.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/po/PackerConfig.java

@@ -1,7 +1,6 @@
-package cn.reghao.bnt.web.devops.app.model.po.config.build;
+package cn.reghao.bnt.web.devops.builds.model.po;
 
 import cn.reghao.bnt.common.docker.po.DockerAuth;
-import cn.reghao.bnt.web.devops.app.model.po.DockerRegistry;
 import cn.reghao.bnt.web.devops.build.model.PackerDto;
 import cn.reghao.bnt.common.msg.constant.PackType;
 import cn.reghao.bnt.web.util.validator.provider.PackerConfigGroupSequenceProvider;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/po/config/build/RepoAuthConfig.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/po/RepoAuthConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.po.config.build;
+package cn.reghao.bnt.web.devops.builds.model.po;
 
 import cn.reghao.bnt.web.devops.build.model.RepoAuth;
 import cn.reghao.bnt.web.util.validator.provider.RepoAuthGroupSequenceProvider;

web/src/main/java/cn/reghao/bnt/web/devops/app/model/vo/BuildConfig.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/vo/BuildConfig.java

@@ -1,8 +1,8 @@
-package cn.reghao.bnt.web.devops.app.model.vo;
+package cn.reghao.bnt.web.devops.builds.model.vo;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/model/vo/CommitInfoVO.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/model/vo/CommitInfoVO.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.model.vo;
+package cn.reghao.bnt.web.devops.builds.model.vo;
 
 import cn.reghao.bnt.web.devops.build.tool.repo.ChangedFile;
 import cn.reghao.bnt.web.devops.build.tool.repo.CommitInfo;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/BuildDirService.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/BuildDirService.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.service.config;
+package cn.reghao.bnt.web.devops.builds.service;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.BuildDir;
+import cn.reghao.bnt.web.devops.builds.model.po.BuildDir;
 import cn.reghao.jutil.jdk.result.Result;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/CompilerConfigService.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/CompilerConfigService.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.service.config;
+package cn.reghao.bnt.web.devops.builds.service;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
 import cn.reghao.jutil.jdk.result.Result;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/service/DockerRegistryService.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/DockerRegistryService.java

@@ -1,9 +1,9 @@
-package cn.reghao.bnt.web.devops.app.service;
+package cn.reghao.bnt.web.devops.builds.service;
 
 import cn.reghao.bnt.common.docker.DockerImpl;
 import cn.reghao.bnt.common.docker.po.DockerAuth;
-import cn.reghao.bnt.web.devops.app.db.repository.DockerRegistryRepository;
-import cn.reghao.bnt.web.devops.app.model.po.DockerRegistry;
+import cn.reghao.bnt.web.devops.builds.db.repository.DockerRegistryRepository;
+import cn.reghao.bnt.web.devops.builds.model.po.DockerRegistry;
 import org.springframework.stereotype.Service;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/PackerConfigService.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/PackerConfigService.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.service.config;
+package cn.reghao.bnt.web.devops.builds.service;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
 import cn.reghao.jutil.jdk.result.Result;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/RepoAuthConfigService.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/RepoAuthConfigService.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.app.service.config;
+package cn.reghao.bnt.web.devops.builds.service;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.jutil.jdk.result.Result;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/impl/BuildConfigChecker.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/impl/BuildConfigChecker.java

@@ -1,12 +1,12 @@
-package cn.reghao.bnt.web.devops.app.service.config.impl;
+package cn.reghao.bnt.web.devops.builds.service.impl;
 
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.CompilerConfigRepository;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.PackerConfigRepository;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.RepoAuthConfigRepository;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
-import cn.reghao.bnt.web.devops.app.model.vo.BuildConfig;
+import cn.reghao.bnt.web.devops.builds.db.repository.CompilerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.PackerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.RepoAuthConfigRepository;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.vo.BuildConfig;
 import org.springframework.stereotype.Service;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/impl/BuildDirServiceImpl.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/impl/BuildDirServiceImpl.java

@@ -1,10 +1,10 @@
-package cn.reghao.bnt.web.devops.app.service.config.impl;
+package cn.reghao.bnt.web.devops.builds.service.impl;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.BuildDir;
+import cn.reghao.bnt.web.devops.builds.model.po.BuildDir;
 import cn.reghao.bnt.web.devops.build.model.LocalBuildDir;
 import cn.reghao.bnt.common.machine.Disk;
 import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.web.devops.app.service.config.BuildDirService;
+import cn.reghao.bnt.web.devops.builds.service.BuildDirService;
 import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.jutil.jdk.machine.data.detail.DiskDetail;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/impl/CompilerConfigServiceImpl.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/impl/CompilerConfigServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.reghao.bnt.web.devops.app.service.config.impl;
+package cn.reghao.bnt.web.devops.builds.service.impl;
 
 import cn.reghao.bnt.web.devops.app.db.query.AppConfigQuery;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.CompilerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.CompilerConfigRepository;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
 import cn.reghao.bnt.web.devops.build.chain.BuildTools;
-import cn.reghao.bnt.web.devops.app.service.config.CompilerConfigService;
+import cn.reghao.bnt.web.devops.builds.service.CompilerConfigService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import org.springframework.stereotype.Service;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/impl/PackerConfigServiceImpl.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/impl/PackerConfigServiceImpl.java

@@ -1,12 +1,12 @@
-package cn.reghao.bnt.web.devops.app.service.config.impl;
+package cn.reghao.bnt.web.devops.builds.service.impl;
 
 import cn.reghao.bnt.web.devops.app.db.query.AppConfigQuery;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.PackerConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.PackerConfigRepository;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
 import cn.reghao.bnt.web.devops.build.chain.BuildTools;
 import cn.reghao.bnt.common.msg.constant.PackType;
-import cn.reghao.bnt.web.devops.app.service.config.PackerConfigService;
+import cn.reghao.bnt.web.devops.builds.service.PackerConfigService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import org.springframework.stereotype.Service;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/config/impl/RepoAuthConfigServiceImpl.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/service/impl/RepoAuthConfigServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.reghao.bnt.web.devops.app.service.config.impl;
+package cn.reghao.bnt.web.devops.builds.service.impl;
 
 import cn.reghao.bnt.web.devops.app.db.query.AppConfigQuery;
-import cn.reghao.bnt.web.devops.app.db.repository.config.build.RepoAuthConfigRepository;
+import cn.reghao.bnt.web.devops.builds.db.repository.RepoAuthConfigRepository;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.bnt.web.devops.build.chain.BuildTools;
-import cn.reghao.bnt.web.devops.app.service.config.RepoAuthConfigService;
+import cn.reghao.bnt.web.devops.builds.service.RepoAuthConfigService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import org.springframework.stereotype.Service;

web/src/main/java/cn/reghao/bnt/web/util/validator/provider/CompilerConfigGroupSequenceProvider.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.util.validator.provider;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.CompilerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
 import cn.reghao.bnt.web.devops.build.model.constant.CompileType;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 

web/src/main/java/cn/reghao/bnt/web/util/validator/provider/PackerConfigGroupSequenceProvider.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.util.validator.provider;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.PackerConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
 import cn.reghao.bnt.common.msg.constant.PackType;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 

web/src/main/java/cn/reghao/bnt/web/util/validator/provider/RepoAuthGroupSequenceProvider.java

@@ -1,6 +1,6 @@
 package cn.reghao.bnt.web.util.validator.provider;
 
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.bnt.web.devops.build.model.constant.RepoAuthType;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 

web/src/test/java/cn/reghao/bnt/web/devops/GitTest.java

@@ -2,7 +2,7 @@ package cn.reghao.bnt.web.devops;
 
 import cn.reghao.bnt.web.devops.build.model.constant.RepoAuthType;
 import cn.reghao.bnt.web.devops.build.tool.repo.GitImpl;
-import cn.reghao.bnt.web.devops.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.internal.storage.file.FileRepository;