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
7d3c5c10
Commit
7d3c5c10
authored
Sep 06, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
/docker/project/info接口补全字段
parent
e740f5c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
6 deletions
+16
-6
DockerProjectController.java
.../cn/qg/holmes/controller/k8s/DockerProjectController.java
+16
-6
No files found.
src/main/java/cn/qg/holmes/controller/k8s/DockerProjectController.java
View file @
7d3c5c10
...
@@ -98,18 +98,28 @@ public class DockerProjectController {
...
@@ -98,18 +98,28 @@ public class DockerProjectController {
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
dockerProjectQueryWrapper
);
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
dockerProjectQueryWrapper
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"id"
,
dockerProject
.
getId
());
map
.
put
(
"id"
,
dockerProject
.
getId
());
map
.
put
(
"project_name"
,
dockerProject
.
getProjectName
());
map
.
put
(
"type"
,
dockerProject
.
getProjectType
());
map
.
put
(
"type"
,
dockerProject
.
getProjectType
());
map
.
put
(
"git_path"
,
dockerProject
.
getGitPath
());
map
.
put
(
"git_path"
,
dockerProject
.
getGitPath
());
map
.
put
(
"auth"
,
dockerProject
.
getOwner
());
map
.
put
(
"git_path_group"
,
dockerProject
.
getGitPathGroup
());
map
.
put
(
"host_name"
,
dockerProject
.
getHostName
());
map
.
put
(
"config_path"
,
dockerProject
.
getConfigPath
());
map
.
put
(
"desc"
,
dockerProject
.
getDesc
());
map
.
put
(
"desc"
,
dockerProject
.
getDesc
());
map
.
put
(
"is_active"
,
dockerProject
.
getIsActive
()
==
1
);
map
.
put
(
"auth"
,
dockerProject
.
getOwner
());
map
.
put
(
"jar_path"
,
dockerProject
.
getJarPath
());
map
.
put
(
"build_command"
,
dockerProject
.
getBuildCommand
());
map
.
put
(
"start_command"
,
dockerProject
.
getStartCommand
());
map
.
put
(
"stop_command"
,
dockerProject
.
getStopCommand
());
map
.
put
(
"deploy_to_testenv"
,
dockerProject
.
getDeployToDocker
()
==
1
);
map
.
put
(
"deploy_to_testenv"
,
dockerProject
.
getDeployToDocker
()
==
1
);
map
.
put
(
"host_name"
,
dockerProject
.
getHostName
());
map
.
put
(
"is_active"
,
dockerProject
.
getIsActive
()
==
1
);
map
.
put
(
"database"
,
dockerProject
.
getDatabase
());
map
.
put
(
"git_lab"
,
dockerProject
.
getGitPath
().
split
(
":"
)[
0
].
split
(
"@"
)[
1
]);
map
.
put
(
"git_lab"
,
dockerProject
.
getGitPath
().
split
(
":"
)[
0
].
split
(
"@"
)[
1
]);
map
.
put
(
"git_path_group"
,
dockerProject
.
getGitPathGroup
());
map
.
put
(
"project_name"
,
dockerProject
.
getProjectName
());
map
.
put
(
"sonar"
,
dockerProject
.
getSonar
()
==
1
);
map
.
put
(
"sonar"
,
dockerProject
.
getSonar
()
==
1
);
map
.
put
(
"build_command"
,
dockerProject
.
getBuildCommand
());
map
.
put
(
"log_path"
,
dockerProject
.
getLogPath
());
map
.
put
(
"memLimit"
,
dockerProject
.
getMemLimit
());
map
.
put
(
"memRequest"
,
dockerProject
.
getMemRequest
());
map
.
put
(
"cpuLimit"
,
dockerProject
.
getCpuLimit
());
map
.
put
(
"cpuRequest"
,
dockerProject
.
getCpuRequest
());
map
.
put
(
"createdAt"
,
dockerProject
.
getCreateTime
());
map
.
put
(
"createdAt"
,
dockerProject
.
getCreateTime
());
map
.
put
(
"updatedAt"
,
dockerProject
.
getUpdateTime
());
map
.
put
(
"updatedAt"
,
dockerProject
.
getUpdateTime
());
return
JsonResult
.
buildSuccessResult
(
map
);
return
JsonResult
.
buildSuccessResult
(
map
);
...
...
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