更新 AppBuildServiceImpl#clearLocalRepo 清空本地仓库方法

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

@@ -13,6 +13,7 @@ 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;
@@ -125,7 +126,7 @@ public class AppBuildServiceImpl implements AppBuildService {
 
         String repoBranch = appConfigUpdateDto.getRepoBranch();
         if (!repoBranch.equals(appConfig.getRepoBranch())) {
-            buildDirService.eraseLocalRepo(appId);
+            clearLocalRepo(appId);
         }
 
         String repoAuthName = appConfigUpdateDto.getRepoAuthConfig();
@@ -146,7 +147,7 @@ public class AppBuildServiceImpl implements AppBuildService {
         }
 
         appBuildRepository.deleteAppBuild(appId);
-        buildDirService.eraseLocalRepo(appId);
+        clearLocalRepo(appId);
         return Result.result(ResultStatus.SUCCESS);
     }
 
@@ -163,6 +164,11 @@ public class AppBuildServiceImpl implements AppBuildService {
 
     @Override
     public void clearLocalRepo(String appId) {
-        buildDirService.eraseLocalRepo(appId);
+        AppConfig appConfig = appConfigRepository.findByAppId(appId);
+        if (appConfig != null) {
+            String projName = appConfig.getProjName();
+            String gitLocal = String.format("%s/%s_%s", LocalBuildDir.localRepo, appId, projName);
+            buildDirService.eraseLocalRepo(gitLocal);
+        }
     }
 }

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();
-    void eraseLocalRepo(String appId);
+    void eraseLocalRepo(String repoPath);
     BuildDir getBuildDir();
 }

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

@@ -94,9 +94,8 @@ public class BuildDirServiceImpl implements BuildDirService {
     }
 
     @Override
-    public void eraseLocalRepo(String appId) {
-        String localRepo = LocalBuildDir.localRepo + File.separator + appId;
-        File dir = new File(localRepo);
+    public void eraseLocalRepo(String repoPath) {
+        File dir = new File(repoPath);
         try {
             if (dir.exists()) {
                 FileUtils.cleanDirectory(dir);