Przeglądaj źródła

算法库git测试连接

zhaoyan 3 lat temu
rodzic
commit
8f01601560

+ 13 - 0
api-common/pom.xml

@@ -59,7 +59,20 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+        </dependency>
 
 
+        <dependency>
+            <groupId>me.tongfei</groupId>
+            <artifactId>progressbar</artifactId>
+            <version>0.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+        </dependency>
 
 
 
 
     </dependencies>
     </dependencies>

+ 60 - 0
api-common/src/main/java/api/common/util/JgitUtil.java

@@ -0,0 +1,60 @@
+package api.common.util;
+
+import io.minio.MinioClient;
+import io.minio.PutObjectArgs;
+import io.minio.errors.MinioException;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+
+import java.io.*;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+import java.util.Map;
+
+
+
+/**
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ </dependency>
+ */
+public class JgitUtil {
+
+
+   public static Map<String, Ref> testConnection(String remoteUrl, String username, String password) throws GitAPIException {
+       UsernamePasswordCredentialsProvider provider = new UsernamePasswordCredentialsProvider(username,password);
+       Map<String, Ref> asMap = Git.lsRemoteRepository().setRemote(remoteUrl).setCredentialsProvider(provider).callAsMap();
+       return asMap;
+   }
+
+    public static Map<String, Ref> testConnectionByToken(String remoteUrl, String gitToken) throws GitAPIException {
+        UsernamePasswordCredentialsProvider provider = new UsernamePasswordCredentialsProvider("PRIVATE-TOKEN", gitToken);
+        Map<String, Ref> asMap = Git.lsRemoteRepository().setRemote(remoteUrl).setCredentialsProvider(provider).callAsMap();
+        return asMap;
+    }
+
+    public static Git clone(String remoteUrl, String directory, String username, String password) throws GitAPIException, IOException {
+        UsernamePasswordCredentialsProvider provider = new UsernamePasswordCredentialsProvider(username,password);
+        File localPath = new File(directory);
+        Git result = Git.cloneRepository().setURI(remoteUrl).setDirectory(localPath).setCredentialsProvider(provider).call();
+        return result;
+    }
+
+    public static void main(String[] args) throws GitAPIException, IOException {
+       try {
+           Map<String, Ref> asMap = testConnection("http://10.15.12.70:3000/CSS/simulation-cloud.git","zhaoyan","111112111");
+           System.out.println("slfasjkfasfksd:");
+           System.out.println(asMap);
+       }catch (Exception e){
+           System.out.println("failllll:");
+       }
+    }
+
+
+
+
+}

+ 0 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/ctrl/AlgorithmCtrl.java

@@ -5,10 +5,8 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.algorithm.AlgorithmParameter;
 import api.common.pojo.param.algorithm.AlgorithmParameter;
 import com.css.simulation.resource.algorithm.service.AlgorithmService;
 import com.css.simulation.resource.algorithm.service.AlgorithmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 

+ 8 - 6
simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -4,6 +4,7 @@ import api.common.pojo.param.algorithm.AlgorithmParameter;
 import api.common.pojo.param.system.DictParam;
 import api.common.pojo.param.system.DictParam;
 import api.common.pojo.po.algorithm.AlgorithmPO;
 import api.common.pojo.po.algorithm.AlgorithmPO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.DictConstants;
+import api.common.util.JgitUtil;
 import api.common.util.StringUtil;
 import api.common.util.StringUtil;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.algorithm.RunningProjectVO;
 import api.common.pojo.vo.algorithm.RunningProjectVO;
@@ -12,13 +13,12 @@ import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.algorithm.mapper.AlgorithmMapper;
 import com.css.simulation.resource.algorithm.mapper.AlgorithmMapper;
 import com.css.simulation.resource.algorithm.service.AlgorithmService;
 import com.css.simulation.resource.algorithm.service.AlgorithmService;
-import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.system.service.DictService;
 import com.css.simulation.resource.system.service.DictService;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
+import org.eclipse.jgit.lib.Ref;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -31,9 +31,6 @@ public class AlgorithmServiceImpl implements AlgorithmService {
 
 
     @Autowired
     @Autowired
     DictService dictService;
     DictService dictService;
-
-    @Resource
-    FileDownService fileDownService;
     
     
     @Override
     @Override
     public ResponseBodyVO addOrUpdate(AlgorithmParameter param) {
     public ResponseBodyVO addOrUpdate(AlgorithmParameter param) {
@@ -117,7 +114,12 @@ public class AlgorithmServiceImpl implements AlgorithmService {
 
 
     @Override
     @Override
     public ResponseBodyVO testConnection(AlgorithmParameter param) {
     public ResponseBodyVO testConnection(AlgorithmParameter param) {
-        return null;
+        try{
+            Map<String, Ref> asMap = JgitUtil.testConnectionByToken(param.getGitUrl(),param.getGitToken());
+        } catch (Exception e){
+            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE,"连接失败!");
+        }
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,"连接成功");
     }
     }
 
 
     @Override
     @Override