Merge branch 'master' into monitor

src/main/java/cn/qg/holmes/controller/gitlab/GitlabController.java

@@ -116,7 +116,7 @@ public class GitlabController {
                 projectId = (Integer) project.get("id");
             }
         }
-        return JsonResult.buildSuccessResult(gitlabService.getBranchesByProjectId(projectId));
+        return JsonResult.buildSuccessResult(gitlabService.getBranchesByProjectId(projectName, projectId));
 //        String url = "https://qaapi.liangkebang.com/pipeline/getGitBranch?name=" + projectName;
 //        return JsonResult.buildSuccessResult(JSON.parseObject(HttpClientUtils.doGet(url), Map.class));
     }

src/main/java/cn/qg/holmes/utils/GitlabService.java

@@ -13,14 +13,16 @@ import java.util.*;
 public class GitlabService {
 
     private static final String URL = "http://git.quantgroup.cn/";
-
     private static final String TOKEN = "owKJZwenxNaypTAz4Zcd";
-
+    private static final String TJZIMU_URL = "https://gitlab.tjzimu.com/";
+    private static final String TJZIMU_TOKEN = "jDqS5EHHzpGsn8J1aCUG";
     private GitlabAPI gitlabAPI;
+    private GitlabAPI tjzimuGitlabAPI;
 
     public GitlabService() {
         try {
             gitlabAPI = GitlabAPI.connect(URL, TOKEN);
+            tjzimuGitlabAPI = GitlabAPI.connect(TJZIMU_URL, TJZIMU_TOKEN);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -60,24 +62,41 @@ public class GitlabService {
 
     public List<Map<String, Object>> getProjectByRestApi(String projectName) {
         String url = URL + "api/v4/projects";
+        String tjzimuUrl = TJZIMU_URL + "api/v4/projects";
         Map<String, String> params = new HashMap<>();
+        String result;
         params.put("per_page", "200");
         params.put("search", projectName);
-        params.put("private_token", TOKEN);
         params.put("simple", "true");
-        String result = HttpClientUtils.doGet(url, params);
+        if (projectName.equals("xyqb-user3")) {
+            params.put("private_token", TJZIMU_TOKEN);
+            result = HttpClientUtils.doGet(tjzimuUrl, params);
+        } else {
+            params.put("private_token", TOKEN);
+            result = HttpClientUtils.doGet(url, params);
+        }
         return (List<Map<String, Object>>) JSON.parse(result);
     }
 
-    public List<Map> getBranchesByProjectId(Integer projectId) {
+    public List<Map> getBranchesByProjectId(String projectName, Integer projectId) {
         String url = URL + "api/v4/projects/" + projectId.toString() + "/repository/branches";
+        String tjzimuUrl = TJZIMU_URL + "api/v4/projects/" + projectId.toString() + "/repository/branches";
         Map<String, String> params = new HashMap<>();
         List<Map> branchList = new ArrayList<>();
         params.put("per_page", "100");
-        params.put("private_token", TOKEN);
+        if (projectName.equals("xyqb-user3")) {
+            params.put("private_token", TJZIMU_TOKEN);
+        } else {
+            params.put("private_token", TOKEN);
+        }
         for (int i=0; i < 4; i++) {
             params.put("page", String.valueOf(i+1));
-            String requestResult = HttpClientUtils.doGet(url, params);
+            String requestResult;
+            if (projectName.equals("xyqb-user3")) {
+                requestResult = HttpClientUtils.doGet(tjzimuUrl, params);
+            } else {
+                requestResult = HttpClientUtils.doGet(url, params);
+            }
             branchList.addAll(JSONArray.parseArray(requestResult, Map.class));
         }
         return branchList;
@@ -89,7 +108,8 @@ public class GitlabService {
 //        List<String> branches = gitlabService.getBranchesByProjectName("holmes");
 //        System.out.println(branches);
 //        System.out.println(gitlabService.getProjectByRestApi("holmes"));
-        System.out.println(gitlabService.getBranchesByProjectId(795).size());
+//        System.out.println(gitlabService.getBranchesByProjectId("holmes", 795).size());
+        System.out.println(gitlabService.getProjectByRestApi("xyqb-user3"));
     }
 
 }