fix bootstrap bug

Author: yi-ge

Dockerfile

@@ -1,9 +1,7 @@
-FROM node:latest
+FROM node:16.8
 LABEL AUTHOR="yi-ge"
 LABEL maintainer="[email protected]"
 
-RUN apt install gcc g++ make
-
 RUN mkdir /project
 
 ADD . /project

release.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 PACKAGE_VERSION=$(grep 'version' package.json | cut -d '"' -f4)
 
-docker build -t wy373226722/mysql-backup:$PACKAGE_VERSION .
+if [ `arch` == "arm64" ]; then
+  docker buildx build --platform linux/amd64 -t wy373226722/mysql-backup:$PACKAGE_VERSION .
+else
+  docker build -t wy373226722/mysql-backup:$PACKAGE_VERSION .
+fi
 
 docker tag wy373226722/mysql-backup:$PACKAGE_VERSION registry.cn-shenzhen.aliyuncs.com/yi-ge/mysql-backup:$PACKAGE_VERSION
 docker tag wy373226722/mysql-backup:$PACKAGE_VERSION registry.cn-shenzhen.aliyuncs.com/yi-ge/mysql-backup:latest

src/bootstrap.js

@@ -38,7 +38,10 @@ export default (db, log) => {
 
   const dbs = new Map()
   try {
-    schedule.scheduleJob('* * * * *', async function () {
+    schedule.scheduleJob({
+      rule: '* * * * *',
+      tz: 'Asia/Shanghai'
+    }, async function () {
       await db.read()
       const databases = db.data.databases
 
@@ -50,7 +53,10 @@ export default (db, log) => {
           }
 
           // 每个数据库里面的任务
-          const job = schedule.scheduleJob(databases[n].cron, async () => {
+          const job = schedule.scheduleJob({
+            rule: databases[n].cron,
+            tz: 'Asia/Shanghai'
+          }, async () => {
             let success = false
             let execUUID = generateUUID()
             const name = databases[n].name
@@ -322,6 +328,12 @@ export default (db, log) => {
                         fileSize,
                         createdTime,
                       })
+
+                      const code = db.data.codes.find(i => i.uuid === uuid)
+                      Object.assign(code, {
+                        lastExecTime: startTime,
+                        updatedTime: new Date().getTime()
+                      })
                       await db.write()
 
                       log.debug('发送成功短信')
@@ -335,13 +347,6 @@ export default (db, log) => {
                         uploadTime: String((createdTime - dumpTime) / 1000),
                         jobTime: String((createdTime - startTime) / 1000)
                       })
-
-                      const code = db.data.codes.find(i => i.uuid === uuid)
-                      Object.assign(code, {
-                        lastExecTime: startTime,
-                        updatedTime: new Date().getTime()
-                      })
-                      await db.write()
                     } else {
                       db.data.exec.push({
                         execUUID: res.execUUID,

src/services.js

@@ -1404,7 +1404,7 @@ export default [{
         const execLogs = this.$db.data.exec.filter(i => i.execUUID === execUUID)
 
         for (let n = execLogs.length - 1; n >= 0; n--) {
-          if (execLogs[n].result.uuid !== request.query.uuid) {
+          if (execLogs[n].uuid !== request.query.uuid) {
             execLogs.splice(n, 1)
           }
         }
@@ -1439,6 +1439,7 @@ export default [{
         return this.fail(null, -10, '没有权限。')
       }
     } catch (err) {
+      console.log(err)
       return this.fail(null, 403, '认证失败。')
     }
   }