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
1bcdefb2
Commit
1bcdefb2
authored
Sep 07, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增3个提供给jenkins的接口
parent
2ef7abea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
6 deletions
+47
-6
DockerProjectController.java
.../cn/qg/holmes/controller/k8s/DockerProjectController.java
+30
-2
K8sController.java
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
+17
-4
No files found.
src/main/java/cn/qg/holmes/controller/k8s/DockerProjectController.java
View file @
1bcdefb2
...
...
@@ -10,8 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.*
;
@CrossOrigin
@RestController
...
...
@@ -138,4 +137,33 @@ public class DockerProjectController {
map
.
put
(
"updatedAt"
,
dockerProject
.
getUpdateTime
());
return
JsonResult
.
buildSuccessResult
(
map
);
}
/**
* 给jenkins构建提供的项目列表接口
* @param type
* @return
*/
@GetMapping
(
"/get_project_for_jenkins"
)
public
String
getProjectsForJenkins
(
@RequestParam
String
type
)
{
QueryWrapper
<
DockerProject
>
dockerProjectQueryWrapper
=
new
QueryWrapper
<>();
dockerProjectQueryWrapper
.
eq
(
"project_type"
,
type
).
eq
(
"is_active"
,
1
);
List
<
DockerProject
>
dockerProjectList
=
dockerProjectService
.
list
(
dockerProjectQueryWrapper
);
List
<
String
>
resultList
=
new
ArrayList
<>();
for
(
DockerProject
dockerProject:
dockerProjectList
)
{
resultList
.
add
(
dockerProject
.
getProjectName
());
}
resultList
.
sort
(
String:
:
compareTo
);
return
String
.
join
(
"\n"
,
resultList
);
}
@GetMapping
(
"/get_git_path"
)
public
String
getGitPath
(
@RequestParam
String
projectName
)
{
QueryWrapper
<
DockerProject
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"project_name"
,
projectName
);
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
queryWrapper
);
return
dockerProject
.
getGitPath
();
}
}
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
View file @
1bcdefb2
...
...
@@ -14,10 +14,7 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
/**
* k8及容器操作相关接口
...
...
@@ -426,4 +423,20 @@ public class K8sController {
}
return
JsonResult
.
buildSuccessResult
(
String
.
join
(
","
,
nsStrList
));
}
/**
* 给jenkins构建提供的namespace列表
* @param env all、test、dev
* @return
*/
@GetMapping
(
"/get_namespace_for_jenkins"
)
public
String
getNamespaceForJenkins
(
@RequestParam
String
env
)
{
List
<
Map
>
mapList
=
k8sService
.
getNamespaceList
(
env
);
List
<
String
>
resultList
=
new
ArrayList
<>();
for
(
Map
map:
mapList
)
{
resultList
.
add
(
map
.
get
(
"name"
).
toString
());
}
resultList
.
sort
(
String:
:
compareTo
);
return
String
.
join
(
"\n"
,
resultList
);
}
}
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