kubbo/dvcp-node-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-06-20 18:31:14 +08:00
parent 8bf02b4270 4885bd9c27
commit 6a8fa6135a
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rest/autodeploy/getZip.js
View File

@@ -7,7 +7,6 @@ module.exports = {
method: "post", method: "post",
execute: (request, response) => { execute: (request, response) => {
let id = request.query?.id, sql = `select * from node_autodeploy where id='${id}'` let id = request.query?.id, sql = `select * from node_autodeploy where id='${id}'`
db.query(sql).then(res => { db.query(sql).then(res => {
let info = res?.[0] let info = res?.[0]
if (info?.id) { if (info?.id) {
@@ -15,8 +14,7 @@ module.exports = {
fse.emptydir(info.target, () => { fse.emptydir(info.target, () => {
response.send({code: 0}) response.send({code: 0})
}) })
}) }).then(()=>{
Promise.resolve(() => {
if (!!info.type) { if (!!info.type) {
let {type, zipPath, target, name} = info let {type, zipPath, target, name} = info
return execute(`/root/node-service/update.sh ${name} ${zipPath}`).then(() => execute(`/root/node-service/build.sh ${type} ${zipPath} ${target}`)) return execute(`/root/node-service/update.sh ${name} ${zipPath}`).then(() => execute(`/root/node-service/build.sh ${type} ${zipPath} ${target}`))