优化 app 模块的代码结构

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

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.controller.config;
 
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.BuildDirCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.BuildDirCrudService;
 import cn.reghao.jdkutil.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.CompilerConfigCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.CompilerConfigCrudService;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.WebBody;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.PackerConfigCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.PackerConfigCrudService;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.WebBody;

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

@@ -1,9 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.BuildDirCrudService;
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.CompilerConfigCrudService;
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.PackerConfigCrudService;
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.RepoAuthConfigCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.RepoAuthConfigCrudService;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.WebBody;

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

@@ -9,9 +9,9 @@ import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyType;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.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.db.query.config.CompilerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.RepoAuthQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
 import cn.reghao.autodop.dmaster.notification.db.repository.NotifyGroupRepository;

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

@@ -1,7 +1,7 @@
 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.db.query.config.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;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.page;
 
-import cn.reghao.autodop.dmaster.app.db.query.config.build.CompilerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.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;

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller.page;
 
 import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
-import cn.reghao.autodop.dmaster.app.db.query.config.build.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.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;

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

@@ -1,9 +1,9 @@
 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.db.query.config.CompilerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.RepoAuthQuery;
 import cn.reghao.autodop.dmaster.app.model.constant.AppType;
 import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
 import cn.reghao.autodop.dmaster.app.model.po.config.ProjConfig;

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

@@ -1,6 +1,6 @@
 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.db.query.config.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;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.crud.config.build;
+package cn.reghao.autodop.dmaster.app.db.crud.config;
 
 import cn.reghao.autodop.common.machine.disk.Disk;
 import cn.reghao.jdkutil.result.Result;
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * @author reghao
@@ -60,7 +61,7 @@ public class BuildDirCrudService {
         // TODO 目录迁移时不能有应用处于构建过程中
         BuildDir newBuildDir = BuildDirLocal.setBuildDir(newDirPath);
         File file = new File(oldPackDir);
-        if (file.list().length != 0) {
+        if (Objects.requireNonNull(file.list()).length != 0) {
             try {
                 FileOps.copyDirContentToDir(oldPackDir, BuildDirLocal.packDir);
             } catch (IOException e) {

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.crud.config.build;
+package cn.reghao.autodop.dmaster.app.db.crud.config;
 
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.crud.config.build;
+package cn.reghao.autodop.dmaster.app.db.crud.config;
 
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.crud.config.build;
+package cn.reghao.autodop.dmaster.app.db.crud.config;
 
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.jdkutil.result.ResultStatus;

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

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config;
 
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.db.query.config.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.db.query.config.CompilerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.PackerQuery;
+import cn.reghao.autodop.dmaster.app.db.query.config.RepoAuthQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/build/BuildDirQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/BuildDirQuery.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.query.config.build;
+package cn.reghao.autodop.dmaster.app.db.query.config;
 
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
 import cn.reghao.autodop.dmaster.app.db.repository.config.build.BuildDirRepository;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.query.config.build;
+package cn.reghao.autodop.dmaster.app.db.query.config;
 
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.db.repository.config.build.CompilerConfigRepository;

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

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.query.config.build;
+package cn.reghao.autodop.dmaster.app.db.query.config;
 
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.db.repository.config.build.PackerConfigRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/build/RepoAuthQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/RepoAuthQuery.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.app.db.query.config.build;
+package cn.reghao.autodop.dmaster.app.db.query.config;
 
 import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.autodop.dmaster.app.db.repository.config.build.RepoAuthConfigRepository;

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

@@ -5,7 +5,7 @@ import ch.qos.logback.core.Appender;
 import cn.reghao.autodop.common.log.LoggerConfig;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.autodop.common.msg.MsgQueue;
-import cn.reghao.autodop.dmaster.app.db.crud.config.build.BuildDirCrudService;
+import cn.reghao.autodop.dmaster.app.db.crud.config.BuildDirCrudService;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDirLocal;
 import cn.reghao.autodop.dmaster.mqttsub.MessageListener;