diff --git a/src/rest/autodeploy/confirmZip.js b/src/rest/autodeploy/confirmZip.js index e93af91..a9e1779 100644 --- a/src/rest/autodeploy/confirmZip.js +++ b/src/rest/autodeploy/confirmZip.js @@ -1,5 +1,4 @@ const dbUtils = require("../../utils/dbUitls"); -const fse = require("fs-extra"); module.exports = { action: "/node/autodeploy/confirmZip", method: "post", @@ -8,11 +7,7 @@ module.exports = { dbUtils.query(sql).then(res => { let info = res?.[0] if (info?.id) { - if (info.err) response.send({code: 1, err: info.err}) - else fse.pathExists(`zips/${info.id}/dist`, (err, exists) => { - console.log(`zips/${info.id}/dist=========>${exists}`) - response.send({code: 0, data: exists}) - }) + response.send({code: 0, data: info}) } else response.send({code: 1, err: "无法找到git信息"}) }).catch(err => { console.log(err) diff --git a/src/rest/autodeploy/getZip.js b/src/rest/autodeploy/getZip.js index 504e21b..214bbde 100644 --- a/src/rest/autodeploy/getZip.js +++ b/src/rest/autodeploy/getZip.js @@ -5,17 +5,20 @@ module.exports = { method: "post", execute: (request, response) => { let id = request.query?.id, sql = `select * from node_autodeploy where id='${id}'` + db.query(sql).then(res => { let info = res?.[0] if (info?.id) { + db.query(`update node_autodeploy set download=null,error=null where id='${info.id}'`) setTimeout(() => { response.send({code: 0}) }, 2000) zip(info).then(() => { db.query(`update node_autodeploy set download='${new Date()}',error='' where id='${info.id}'`) }).catch(err => { - db.query(`update node_autodeploy set error='${err}' where id='${info.id}'`) console.log(err) + db.query(`update node_autodeploy set error='${err}' where id='${info.id}'`) + }) } else response.send({code: 1, err: "无法找到git信息"}) }).catch(err => {