时间优化
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
"author": "kubbo",
|
"author": "kubbo",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"archiver": "^5.3.0",
|
"archiver": "^5.3.0",
|
||||||
|
"dayjs": "^1.11.0",
|
||||||
"express": "^4.17.3",
|
"express": "^4.17.3",
|
||||||
"fs-extra": "^10.0.1",
|
"fs-extra": "^10.0.1",
|
||||||
"helmet": "^5.0.2",
|
"helmet": "^5.0.2",
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ const dbUtils = require("../../utils/dbUitls");
|
|||||||
const archiver = require("archiver")
|
const archiver = require("archiver")
|
||||||
const fse = require("fs-extra");
|
const fse = require("fs-extra");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const dir = require("path")
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
action: "/node/autodeploy/download",
|
action: "/node/autodeploy/download",
|
||||||
method: "post",
|
method: "post",
|
||||||
@@ -21,16 +20,13 @@ module.exports = {
|
|||||||
arc.on('error', err => {
|
arc.on('error', err => {
|
||||||
response.send({code: 1, err})
|
response.send({code: 1, err})
|
||||||
})
|
})
|
||||||
arc.on('progress', (e) => {
|
|
||||||
console.log('%s压缩进度...%s/%s', info.id, e.entries.processed, e.entries.total)
|
|
||||||
})
|
|
||||||
arc.pipe(output)
|
arc.pipe(output)
|
||||||
arc.directory(path, false)
|
arc.directory(path, false)
|
||||||
arc.finalize().then(() => {
|
arc.finalize().then(() => {
|
||||||
console.log('压缩完成!')
|
console.log('压缩完成!')
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
response.download(zipPath)
|
response.download(zipPath)
|
||||||
}, 500)
|
}, 1000)
|
||||||
})
|
})
|
||||||
} else response.send({code: 1, err: "没有打包文件!"})
|
} else response.send({code: 1, err: "没有打包文件!"})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
const db = require("../../utils/dbUitls");
|
const db = require("../../utils/dbUitls");
|
||||||
const zip = require("../../tools/zipProject")
|
const zip = require("../../tools/zipProject")
|
||||||
|
const dayjs = require("dayjs")
|
||||||
module.exports = {
|
module.exports = {
|
||||||
action: "/node/autodeploy/getZip",
|
action: "/node/autodeploy/getZip",
|
||||||
method: "post",
|
method: "post",
|
||||||
@@ -14,11 +15,10 @@ module.exports = {
|
|||||||
response.send({code: 0})
|
response.send({code: 0})
|
||||||
}, 2000)
|
}, 2000)
|
||||||
zip(info).then(() => {
|
zip(info).then(() => {
|
||||||
db.query(`update node_autodeploy set download='${new Date()}',error='' where id='${info.id}'`)
|
db.query(`update node_autodeploy set download='${dayjs().format("YYYY-MM-DD HH:mm:ss")}',error='' where id='${info.id}'`)
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
db.query(`update node_autodeploy set error='${err}' where id='${info.id}'`)
|
db.query(`update node_autodeploy set error='${err}' where id='${info.id}'`)
|
||||||
|
|
||||||
})
|
})
|
||||||
} else response.send({code: 1, err: "无法找到git信息"})
|
} else response.send({code: 1, err: "无法找到git信息"})
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
|||||||
Reference in New Issue
Block a user