Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
holmes
Commits
b8e118ce
Commit
b8e118ce
authored
Jun 08, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改从qaapi获取分支,去掉gitlabservice的@Compoment
parent
eb9c3c09
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
GitlabController.java
...java/cn/qg/holmes/controller/gitlab/GitlabController.java
+5
-2
PipelineServiceImpl.java
...cn/qg/holmes/service/gitlab/impl/PipelineServiceImpl.java
+1
-0
GitlabService.java
src/main/java/cn/qg/holmes/utils/GitlabService.java
+1
-1
No files found.
src/main/java/cn/qg/holmes/controller/gitlab/GitlabController.java
View file @
b8e118ce
...
@@ -3,6 +3,7 @@ package cn.qg.holmes.controller.gitlab;
...
@@ -3,6 +3,7 @@ package cn.qg.holmes.controller.gitlab;
import
cn.qg.holmes.common.JsonResult
;
import
cn.qg.holmes.common.JsonResult
;
import
cn.qg.holmes.utils.GitlabService
;
import
cn.qg.holmes.utils.GitlabService
;
import
cn.qg.holmes.utils.HttpClientUtils
;
import
cn.qg.holmes.utils.HttpClientUtils
;
import
com.alibaba.fastjson.JSON
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.bind.annotation.CrossOrigin
;
import
org.springframework.web.bind.annotation.CrossOrigin
;
...
@@ -62,7 +63,9 @@ public class GitlabController {
...
@@ -62,7 +63,9 @@ public class GitlabController {
*/
*/
@GetMapping
(
"/branches"
)
@GetMapping
(
"/branches"
)
public
JsonResult
getBranchesByProject
(
String
projectName
)
{
public
JsonResult
getBranchesByProject
(
String
projectName
)
{
List
<
String
>
branches
=
gitlabService
.
getBranchesByProjectName
(
projectName
);
String
url
=
"https://qaapi.liangkebang.com/pipeline/getGitBranch?name="
+
projectName
;
return
JsonResult
.
buildSuccessResult
(
branches
);
return
JsonResult
.
buildSuccessResult
(
JSON
.
parseObject
(
HttpClientUtils
.
doGet
(
url
),
Map
.
class
));
// List<String> branches = gitlabService.getBranchesByProjectName(projectName);
// return JsonResult.buildSuccessResult(branches);
}
}
}
}
src/main/java/cn/qg/holmes/service/gitlab/impl/PipelineServiceImpl.java
View file @
b8e118ce
...
@@ -28,6 +28,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineMapper, Pipeline> i
...
@@ -28,6 +28,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineMapper, Pipeline> i
@Autowired
@Autowired
DingRobotService
dingRobotService
;
DingRobotService
dingRobotService
;
/**
/**
* 构建pipeline
* 构建pipeline
* @param gitlabData gitlab发送过来的推送事件
* @param gitlabData gitlab发送过来的推送事件
...
...
src/main/java/cn/qg/holmes/utils/GitlabService.java
View file @
b8e118ce
...
@@ -10,7 +10,7 @@ import java.util.HashMap;
...
@@ -10,7 +10,7 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
@Component
public
class
GitlabService
{
public
class
GitlabService
{
private
static
final
String
URL
=
"http://git.quantgroup.cn/"
;
private
static
final
String
URL
=
"http://git.quantgroup.cn/"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment