Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
node-devlop-rest-api
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
zhouzihao
node-devlop-rest-api
Commits
499f9dc7
Commit
499f9dc7
authored
Mar 31, 2020
by
zhouzihao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dev-添加成功回调
parent
df3e93ed
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
6 deletions
+20
-6
api/buidApi.js
api/buidApi.js
+2
-2
api/buildLogApi.js
api/buildLogApi.js
+2
-1
config/common.js
config/common.js
+8
-0
shell/java.js
shell/java.js
+6
-1
tools/databaseHelper.js
tools/databaseHelper.js
+2
-2
No files found.
api/buidApi.js
View file @
499f9dc7
...
...
@@ -12,10 +12,10 @@ module.exports = {
var
branch
=
body
.
branch
;
var
version
=
body
.
version
;
var
result
=
await
buildshell
.
build
(
p_id
,
env_id
,
branch
,
version
);
res
.
end
(
"
{
success
:true}
"
);
res
.
end
(
"
{
\"
success
\"
:true}
"
);
}
catch
(
error
)
{
console
.
log
(
error
);
res
.
end
(
"
{
success
:false}
"
);
res
.
end
(
"
{
\"
success
\"
:false}
"
);
}
})();
}
...
...
api/buildLogApi.js
View file @
499f9dc7
...
...
@@ -2,7 +2,8 @@ var helper = require('../tools/helper')
module
.
exports
=
{
//分页查询构建日志
pageBuildLog
:
helper
.
pagedBuilder
(
'
build_log
'
,
'
log_id
'
,
{},
'
create_time desc
'
),
// FIXME 查询不支持 可能是原始包的bug 需要修改
pageBuildLog
:
helper
.
pagedBuilder
(
'
build_log
'
,
'
log_id
'
,
{},
'
log_id
'
),
// 成功失败回调使用的修改接口
// fixme 阻止新添加新的数据
backCallSuccess
:
helper
.
saveBuilder
(
'
build_log
'
,
'
log_id
'
),
...
...
config/common.js
0 → 100644
View file @
499f9dc7
/**
* 基础配置
*/
const
config
=
{
host
:
'
10.16.11.106
'
,
port
:
3000
}
module
.
exports
=
config
;
\ No newline at end of file
shell/java.js
View file @
499f9dc7
...
...
@@ -7,6 +7,7 @@ var sleep = require('sleep');
var
pomParser
=
require
(
"
pom-parser
"
);
var
databaseHelper
=
require
(
"
../tools/databaseHelper
"
);
var
moment
=
require
(
'
moment
'
);
var
config
=
require
(
"
../config/common
"
);
/**
* 构建Java项目
...
...
@@ -186,6 +187,9 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
var
logObject
=
await
databaseHelper
.
saveJsonToDb
(
log_data
,
'
build_log
'
,
'
log_id
'
);
console
.
log
(
JSON
.
stringify
(
logObject
));
//设置成功回调
var
success_str
=
"
-
\"
curl -X PUT http://
"
+
config
.
host
+
"
:
"
+
config
.
port
+
"
/build/log/back -H 'Content-Type: application/json'
"
+
`-d '{\\"log_id\\":
${
logObject
.
log_id
}
,\\"success\\":1}'"`
;
// 创建gitlab-ci
fs
.
writeFileSync
(
`
${
project_dir
}
/.gitlab-ci.yml`
,
typeObj
.
gitlab_ci
);
var
gitlab_ci_map
=
{
...
...
@@ -195,7 +199,8 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
"
{docker_build_str}
"
:
_
.
trimEnd
(
docker_build_str
,
"
\n
"
),
"
{docker_tag_str}
"
:
_
.
trimEnd
(
docker_tag_str
,
"
\n
"
),
"
{docker_push_str}
"
:
_
.
trimEnd
(
docker_push_str
,
"
\n
"
),
"
{build_str_java}
"
:
build_script
"
{build_str_java}
"
:
build_script
,
"
{success_str}
"
:
success_str
};
await
replaceFileByMap
(
gitlab_ci_map
,
`
${
project_dir
}
/.gitlab-ci.yml`
);
// 提供gitlab-ci
...
...
tools/databaseHelper.js
View file @
499f9dc7
...
...
@@ -125,8 +125,8 @@ var pagedDbByJson = (json, table, items, key, page = 1, pageSize = 10, orderby =
$limit
:
pageSize
,
$offset
:
(
page
-
1
)
*
pageSize
,
}
if
(
!
_
.
isEmpty
)
{
extra
[
'
$order
b
y
'
]
=
orderby
;
if
(
!
_
.
isEmpty
(
orderby
)
)
{
extra
[
'
$order
B
y
'
]
=
orderby
;
}
return
listDbByJson
(
json
,
table
,
items
,
extra
).
then
((
data
)
=>
{
resovle
({
...
...
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