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
40d46750
Commit
40d46750
authored
Aug 25, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增角色-namespace关联接口
parent
a9d5369d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
DockerProjectController.java
.../cn/qg/holmes/controller/k8s/DockerProjectController.java
+3
-0
K8sController.java
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
+21
-0
No files found.
src/main/java/cn/qg/holmes/controller/k8s/DockerProjectController.java
View file @
40d46750
package
cn
.
qg
.
holmes
.
controller
.
k8s
;
import
cn.qg.holmes.common.JsonResult
;
import
cn.qg.holmes.config.annotation.RequiresPermissions
;
import
cn.qg.holmes.entity.k8s.DockerProject
;
import
cn.qg.holmes.service.k8s.DockerProjectService
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
...
...
@@ -44,6 +45,7 @@ public class DockerProjectController {
* @param dockerProject docker项目实体类
* @return
*/
@RequiresPermissions
(
"docker:proconfig:add"
)
@PostMapping
(
"/add"
)
public
JsonResult
addDockerProject
(
@RequestBody
DockerProject
dockerProject
)
{
return
JsonResult
.
buildSuccessResult
(
dockerProjectService
.
saveOrUpdate
(
dockerProject
));
...
...
@@ -55,6 +57,7 @@ public class DockerProjectController {
* @param dockerProject docker项目实体类
* @return
*/
@RequiresPermissions
(
"docker:proconfig:edit"
)
@PostMapping
(
"/edit"
)
public
JsonResult
editDockerProject
(
@RequestBody
DockerProject
dockerProject
)
{
return
JsonResult
.
buildSuccessResult
(
dockerProjectService
.
saveOrUpdate
(
dockerProject
));
...
...
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
View file @
40d46750
...
...
@@ -332,4 +332,25 @@ public class K8sController {
@RequestParam
String
owner
)
{
return
JsonResult
.
buildSuccessResult
(
k8sService
.
createNewNamespace
(
name
,
desc
,
owner
));
}
/**
* 根据roleId获取有权限展示按钮的namespace
* @param roleId
* @return
*/
@GetMapping
(
"/role/namespace"
)
public
JsonResult
getNamespaceListByRoleId
(
@RequestParam
Integer
roleId
)
{
List
<
String
>
nsStrList
=
new
ArrayList
<>();
List
<
Map
>
nsMapList
=
new
ArrayList
<>();
if
(
roleId
==
1
||
roleId
==
2
)
{
nsMapList
=
k8sService
.
getNamespaceList
(
"all"
);
}
if
(
roleId
==
3
)
{
nsMapList
=
k8sService
.
getNamespaceList
(
"dev"
);
}
for
(
Map
map:
nsMapList
)
{
nsStrList
.
add
(
map
.
get
(
"name"
).
toString
());
}
return
JsonResult
.
buildSuccessResult
(
String
.
join
(
","
,
nsStrList
));
}
}
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