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
9479ce19
Commit
9479ce19
authored
Jun 10, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pipeline实体类enable字段改成数据
parent
d8ff13c1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
Pipeline.java
src/main/java/cn/qg/holmes/entity/gitlab/Pipeline.java
+1
-1
PipelineServiceImpl.java
...cn/qg/holmes/service/gitlab/impl/PipelineServiceImpl.java
+1
-1
No files found.
src/main/java/cn/qg/holmes/entity/gitlab/Pipeline.java
View file @
9479ce19
...
@@ -16,7 +16,7 @@ public class Pipeline {
...
@@ -16,7 +16,7 @@ public class Pipeline {
private
String
serviceBranch
;
private
String
serviceBranch
;
private
String
serviceType
;
private
String
serviceType
;
private
String
namespace
;
private
String
namespace
;
private
String
enable
;
private
Integer
enable
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
createTime
;
private
Date
createTime
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
src/main/java/cn/qg/holmes/service/gitlab/impl/PipelineServiceImpl.java
View file @
9479ce19
...
@@ -51,7 +51,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineMapper, Pipeline> i
...
@@ -51,7 +51,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineMapper, Pipeline> i
pipelineQueryWrapper
.
eq
(
"service_branch"
,
branch
);
pipelineQueryWrapper
.
eq
(
"service_branch"
,
branch
);
Pipeline
pipeline
=
pipelineMapper
.
selectOne
(
pipelineQueryWrapper
);
Pipeline
pipeline
=
pipelineMapper
.
selectOne
(
pipelineQueryWrapper
);
if
(
pipeline
!=
null
)
{
if
(
pipeline
!=
null
)
{
if
(
pipeline
.
getEnable
()
.
equals
(
"1"
)
)
{
if
(
pipeline
.
getEnable
()
==
1
)
{
log
.
info
(
"pipeline中找到对应项目,且项目是启动状态,开始构建:{}"
,
pipeline
.
toString
());
log
.
info
(
"pipeline中找到对应项目,且项目是启动状态,开始构建:{}"
,
pipeline
.
toString
());
Integer
buildNum
=
jenkinsService
.
buildJenkinsJob
(
pipeline
.
getServiceType
(),
projectName
,
branch
,
pipeline
.
getNamespace
());
Integer
buildNum
=
jenkinsService
.
buildJenkinsJob
(
pipeline
.
getServiceType
(),
projectName
,
branch
,
pipeline
.
getNamespace
());
String
markdown
=
DingdingUtils
.
buildPipelineMarkdownMsg
(
projectName
,
branch
,
pipeline
.
getServiceType
(),
author
,
message
,
commitDate
,
pipeline
.
getNamespace
(),
buildNum
.
toString
());
String
markdown
=
DingdingUtils
.
buildPipelineMarkdownMsg
(
projectName
,
branch
,
pipeline
.
getServiceType
(),
author
,
message
,
commitDate
,
pipeline
.
getNamespace
(),
buildNum
.
toString
());
...
...
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