修复 dmaster 启动时创建本地构建目录的 bug

dmaster 和 dagent 已部署到测试环境

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

@@ -46,7 +46,7 @@ public class BuildConfigController {
     @ApiOperation(value = "迁移构建目录")
     @PostMapping(value = "/dir", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> modifyBuildDir(@Validated BuildDir buildDir) {
-        Result result = buildDirCrudService.insertOrUpdate(buildDir);
+        Result result = buildDirCrudService.update(buildDir);
         return ResponseEntity.ok().body(WebBody.result(result));
     }
 

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

@@ -26,14 +26,18 @@ public class BuildDirCrudService {
         this.disk = disk;
     }
 
+    public void insert(BuildDir buildDir) {
+        buildDirRepository.save(buildDir);
+    }
+
     /**
-     * 整个操作应该线程安全，且处于一个事务中
+     * TODO 整个操作应该线程安全，且处于一个事务中
      *
      * @param
      * @return
      * @date 2021-06-17 下午9:10
      */
-    public synchronized Result insertOrUpdate(BuildDir buildDir) {
+    public synchronized Result update(BuildDir buildDir) {
         if (buildDir.getId() == null) {
             return Result.result(ResultStatus.FAIL, "构建目录不存在");
         }

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/lifecycle/DmasterLifecycle.java

@@ -2,6 +2,7 @@ package cn.reghao.autodop.dmaster.utils.lifecycle;
 
 import cn.reghao.autodop.common.log.LoggerConfig;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
+import cn.reghao.autodop.common.result.Result;
 import cn.reghao.autodop.common.utils.MachineIdentity;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.BuildDirCrudService;
 import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
@@ -72,13 +73,16 @@ public class DmasterLifecycle implements ApplicationRunner, DisposableBean {
     }
 
     private void initBuildDir() {
+        log.info("初始化构建目录...");
         BuildDir buildDir = buildDirCrudService.selectByUniqueKey(MACHINE_ID);
         if (buildDir == null) {
             buildDir = BuildDirLocal.setDefaultBuildDir();
         } else {
             BuildDirLocal.refreshBuildDir(buildDir);
         }
-        buildDirCrudService.insertOrUpdate(buildDir);
+
+        log.info("将 {} 写入数据库...", buildDir);
+        buildDirCrudService.insert(buildDir);
     }
 
     private void startMonitorJobs() throws SchedulerException {

dmaster/src/main/resources/application-test.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.220:3306/devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://192.168.0.77:3306/devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
     username: azy_test
-    password: Test@123456
+    password: Azy@123456
   data:
     mongodb:
       uri: mongodb://192.168.0.220/devops_tdb