更新 BuildDirService

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/controller/AppConfigController.java

@@ -167,7 +167,7 @@ public class AppConfigController {
     @Operation(summary = "清空应用本地仓库", description = "N")
     @PostMapping(value = "/clear_repo", produces = MediaType.APPLICATION_JSON_VALUE)
     public String deleteAppLocalRepo(String appId) {
-        Result result = appBuildService.clearLocalRepo(appId);
-        return WebResult.result(result);
+        appBuildService.clearLocalRepo(appId);
+        return WebResult.success();
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/service/AppBuildService.java

@@ -17,5 +17,5 @@ public interface AppBuildService {
     void deleteBuildLog(String buildLogId);
 
     void resetBuildStat();
-    Result clearLocalRepo(String appId);
+    void clearLocalRepo(String appId);
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/service/impl/AppBuildServiceImpl.java

@@ -13,18 +13,14 @@ import cn.reghao.devops.mgr.ops.app.service.AppBuildService;
 import cn.reghao.devops.mgr.ops.app.service.AppDeployService;
 import cn.reghao.devops.mgr.ops.build.model.vo.BuildConfig;
 import cn.reghao.devops.mgr.ops.build.service.BuildConfigChecker;
-import cn.reghao.devops.mgr.ops.builder.model.LocalBuildDir;
 import cn.reghao.devops.mgr.ops.builder.tool.repo.GitClient;
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.io.File;
-import java.io.IOException;
 import java.time.LocalDateTime;
 
 /**
@@ -40,7 +36,7 @@ public class AppBuildServiceImpl implements AppBuildService {
     private final AppDeployService appDeployService;
     private final GitClient gitClient;
     private final AppBuildRepository appBuildRepository;
-    private BuildDirService buildDirService;
+    private final BuildDirService buildDirService;
 
     public AppBuildServiceImpl(AppConfigRepository appConfigRepository, BuildLogRepository buildLogRepository,
                                BuildConfigChecker buildConfigChecker, AppDeployService appDeployService,
@@ -128,10 +124,7 @@ public class AppBuildServiceImpl implements AppBuildService {
 
         String repoBranch = appConfigUpdateDto.getRepoBranch();
         if (!repoBranch.equals(appConfig.getRepoBranch())) {
-            Result result = clearLocalRepo(appId);
-            if (result.getCode() != 0) {
-                return result;
-            }
+            buildDirService.eraseLocalRepo(appId);
         }
 
         int repoAuthId = appConfigUpdateDto.getRepoAuthConfigId();
@@ -152,7 +145,7 @@ public class AppBuildServiceImpl implements AppBuildService {
         }
 
         appBuildRepository.deleteAppBuild(appId);
-        clearLocalRepo(appId);
+        buildDirService.eraseLocalRepo(appId);
         return Result.result(ResultStatus.SUCCESS);
     }
 
@@ -168,8 +161,7 @@ public class AppBuildServiceImpl implements AppBuildService {
     }
 
     @Override
-    public Result clearLocalRepo(String appId) {
-        Result result = buildDirService.eraseLocalRepo(appId);
-        return result;
+    public void clearLocalRepo(String appId) {
+        buildDirService.eraseLocalRepo(appId);
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/service/BuildDirService.java

@@ -10,6 +10,6 @@ import cn.reghao.jutil.jdk.web.result.Result;
 public interface BuildDirService {
     void init();
     void eraseAll();
-    Result eraseLocalRepo(String appId);
+    void eraseLocalRepo(String appId);
     BuildDir getBuildDir();
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/service/impl/BuildDirServiceImpl.java

@@ -95,15 +95,14 @@ public class BuildDirServiceImpl implements BuildDirService {
     }
 
     @Override
-    public Result eraseLocalRepo(String appId) {
+    public void eraseLocalRepo(String appId) {
         String localRepo = LocalBuildDir.localRepo + File.separator + appId;
         File dir = new File(localRepo);
         try {
             FileUtils.cleanDirectory(dir);
         } catch (IOException e) {
-            return Result.fail(e.getMessage());
+            log.error("{}", e.getMessage());
         }
-        return Result.success();
     }
 
     @Override