加入Git用户名密码配置

Author: gitchenjh

README.md

@@ -12,5 +12,5 @@ prepare the jacoco code coverage report
 config the necessary params and create tmp folder
 #### step4:
 run command: 
-java -DGitURI=git@xxx/xxx.git -DNewVersion=refs/remotes/origin/daily -DOldVersion=refs/heads/master -DDiffFolder=/home/it/tmp/ 
+java -DGitURI=git@xxx/xxx.git -DGitUsername=xxx -DGitPassword=xxx  -DNewVersion=refs/remotes/origin/daily -DOldVersion=refs/heads/master -DDiffFolder=/home/it/tmp/ 
  -DJacocoReport=/home/it/codeCoverage/Check_Order_related/ -jar jacoco-gitdiff-0.0.1-release.jar

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.keking</groupId>
     <artifactId>jacoco-gitdiff</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/keking/DiffClover.java

@@ -18,10 +18,12 @@ public class DiffClover {
     public static void main(String[] args) {
 
         // step1:获取必要的配置信息
-        String gitUrl, newVersion, oldVersion, diffFolder, jacocoReport = "";
+        String gitUrl, gitUsername, gitPassword, newVersion, oldVersion, diffFolder, jacocoReport = "";
 
         try {
             gitUrl = System.getProperty("GitURI").trim();
+            gitUsername = System.getProperty("GitUsername") == null ? null : System.getProperty("GitUsername").trim();
+            gitPassword = System.getProperty("GitPassword") == null ? null : System.getProperty("GitPassword").trim();
             diffFolder = System.getProperty("DiffFolder").trim();
             newVersion = System.getProperty("NewVersion").trim();
             oldVersion = System.getProperty("OldVersion").trim();
@@ -43,9 +45,9 @@ public static void main(String[] args) {
             // step2:获取最新的源代码
             List<File> fileList = (List<File>) FileUtils.listFiles(new File(diffFolder), null, true);
             if (fileList.size() < 10) {
-                JGitUtil.cloneGit(gitUrl, diffFolder);
+                JGitUtil.cloneGit(gitUrl, diffFolder, gitUsername, gitPassword);
             } else {
-                JGitUtil.pullGit(diffFolder);
+                JGitUtil.pullGit(diffFolder, gitUsername, gitPassword);
             }
             // step3:针对传入分支比较
             List<ClassDiffEntity> diffs = JGitUtil.diffBranch(diffFolder, newVersion, oldVersion);

src/main/java/com/keking/git/JGitUtil.java

@@ -12,8 +12,10 @@
 
 import com.jcraft.jsch.Session;
 import org.apache.commons.io.FileUtils;
+import org.eclipse.jgit.api.CloneCommand;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.ListBranchCommand.ListMode;
+import org.eclipse.jgit.api.PullCommand;
 import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.diff.DiffFormatter;
 import org.eclipse.jgit.diff.RawText;
@@ -26,6 +28,7 @@
 import org.eclipse.jgit.transport.JschConfigSessionFactory;
 import org.eclipse.jgit.transport.OpenSshConfig;
 import org.eclipse.jgit.transport.SshSessionFactory;
+import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.eclipse.jgit.treewalk.AbstractTreeIterator;
 import org.eclipse.jgit.treewalk.CanonicalTreeParser;
 import org.eclipse.jgit.util.StringUtils;
@@ -56,12 +59,16 @@ protected void configure(OpenSshConfig.Host hc, Session session) {
      * @param tmpPath
      * @throws Exception
      */
-    public static void cloneGit(String remoteURI, String tmpPath) throws Exception {
+    public static void cloneGit(String remoteURI, String tmpPath, String gitUsername, String gitPassword) throws Exception {
         File localPath = new File(tmpPath);
         if (localPath.exists()) {
             FileUtils.deleteDirectory(localPath);
         }
-        try (Git git = Git.cloneRepository().setURI(remoteURI).setCloneAllBranches(true).setDirectory(localPath).call()) {
+        CloneCommand gitCommand = Git.cloneRepository().setURI(remoteURI).setCloneAllBranches(true).setDirectory(localPath);
+        if (gitUsername != null && gitPassword != null) {
+            gitCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(gitUsername, gitPassword));
+        }
+        try (Git git = gitCommand.call()) {
             for (Ref b : git.branchList().setListMode(ListMode.ALL).call())
                 logger.debug("cloned branch:" + b.getName());
         }
@@ -73,9 +80,17 @@ public static void cloneGit(String remoteURI, String tmpPath) throws Exception {
      * @param tmpPath
      * @throws Exception
      */
-    public static void pullGit(String tmpPath) throws Exception {
+    public static void pullGit(String tmpPath, String gitUsername, String gitPassword) throws Exception {
+        UsernamePasswordCredentialsProvider credential = null;
+        if (gitUsername != null && gitPassword != null) {
+            credential = new UsernamePasswordCredentialsProvider(gitUsername, gitPassword);
+        }
         try (Git git = Git.open(new File(tmpPath))) {
-            git.pull().call();
+            PullCommand pullCommand = git.pull();
+            if (credential != null) {
+                pullCommand.setCredentialsProvider(credential);
+            }
+            pullCommand.call();
         }
     }