ci4s
/
ci4sManagement-cloud
41
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

优化并行处理

This commit is contained in:
fanshuai 2024-09-10 14:56:24 +08:00
parent c158ff2e25
commit efd815edd7
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
View File

@ -327,9 +327,8 @@ public class DVCUtils {
}
public static void refreshRemoteBranches(String localPath, String username, String password, String branch) throws IOException, GitAPIException {
public static void refreshRemoteBranches(String localPath, String username, String password, String branch) throws Exception {
long startTime = System.currentTimeMillis();
try (Repository repository = new FileRepositoryBuilder()
.setGitDir(new File(localPath + "/.git"))
.readEnvironment()
@ -344,10 +343,8 @@ public class DVCUtils {
log.info("Repository is in a merging state, please resolve conflicts manually.");
return;
}
// 设置凭证提供者
UsernamePasswordCredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(username, password);
// 获取远程分支
long fetchStartTime = System.currentTimeMillis();
FetchResult fetchResult = git.fetch()
@ -362,7 +359,6 @@ public class DVCUtils {
for (Ref ref : fetchedRefs) {
log.info("Fetched branch: " + ref.getName());
}
// 更新本地分支信息
long branchListStartTime = System.currentTimeMillis();
git.branchList()
@ -385,20 +381,15 @@ public class DVCUtils {
} catch (InterruptedException e) {
log.error("Executor service interrupted", e);
}
long branchListEndTime = System.currentTimeMillis();
log.info("Branch list and update time: " + (branchListEndTime - branchListStartTime) + " ms");
log.info("远程分支刷新到本地完成。");
} catch (Exception e) {
log.error("Error occurred while refreshing remote branches ", e); ;
}
// 切换分支
gitCheckoutBranch(localPath, branch);
dvcCheckout(localPath);
} catch (Exception e) {
throw new RuntimeException(e);
}
long endTime = System.currentTimeMillis();
log.info("Total execution time: " + (endTime - startTime) + " ms");
}