From ec7adbbe718696c42a4a97e5a8326c9bf7efd27d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 1 Apr 2022 18:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                    | 1 +
 src/rest/autodeploy/download.js | 6 +-----
 src/rest/autodeploy/getZip.js   | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 809eb80..cf429d2 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
   "author": "kubbo",
   "dependencies": {
     "archiver": "^5.3.0",
+    "dayjs": "^1.11.0",
     "express": "^4.17.3",
     "fs-extra": "^10.0.1",
     "helmet": "^5.0.2",
diff --git a/src/rest/autodeploy/download.js b/src/rest/autodeploy/download.js
index a92afe6..61b603c 100644
--- a/src/rest/autodeploy/download.js
+++ b/src/rest/autodeploy/download.js
@@ -2,7 +2,6 @@ const dbUtils = require("../../utils/dbUitls");
 const archiver = require("archiver")
 const fse = require("fs-extra");
 const fs = require("fs");
-const dir = require("path")
 module.exports = {
   action: "/node/autodeploy/download",
   method: "post",
@@ -21,16 +20,13 @@ module.exports = {
             arc.on('error', 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.directory(path, false)
             arc.finalize().then(() => {
               console.log('压缩完成!')
               setTimeout(() => {
                 response.download(zipPath)
-              }, 500)
+              }, 1000)
             })
           } else response.send({code: 1, err: "没有打包文件!"})
         })
diff --git a/src/rest/autodeploy/getZip.js b/src/rest/autodeploy/getZip.js
index 214bbde..c186e37 100644
--- a/src/rest/autodeploy/getZip.js
+++ b/src/rest/autodeploy/getZip.js
@@ -1,5 +1,6 @@
 const db = require("../../utils/dbUitls");
 const zip = require("../../tools/zipProject")
+const dayjs = require("dayjs")
 module.exports = {
   action: "/node/autodeploy/getZip",
   method: "post",
@@ -14,11 +15,10 @@ module.exports = {
           response.send({code: 0})
         }, 2000)
         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 => {
           console.log(err)
           db.query(`update node_autodeploy set error='${err}' where id='${info.id}'`)
-
         })
       } else response.send({code: 1, err: "无法找到git信息"})
     }).catch(err => {