@nger/fk-upload 1.0.113 → 1.0.116

package/dist/templates/check-upload.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckUploadController = void 0;
 const tslib_1 = require("tslib");
+const fk_service_1 = require("./tasks/fk.service");
 const fs_1 = require("fs");
 const fk_download_task_entity_1 = require("./../entities/fk-download-task.entity");
 const rabbitmq_1 = require("@nger/rabbitmq");
@@ -84,10 +85,16 @@ let CheckUploadController = class CheckUploadController {
     async checkWaitUploadTask() {
         const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
         const errors = await download.find({ where: { uploadUrl: (0, typeorm_2.Like)('https://site%') } });
-        await download.update(errors.map(err => err.filename), { status: 1 });
+        if (errors && errors.length > 0) {
+            await download.update(errors.map(err => err.filename), { status: 1 });
+        }
         const list = await download.find({ where: { status: 1, totalSize: (0, typeorm_2.LessThan)(1024 * 1024 * 1024) } });
         const task = this.injector.get(task_service_1.TaskService);
+        const fk = this.injector.get(fk_service_1.FkService);
         await Promise.all(list.map(async (item) => {
+            const cloudSize = await fk.getSize(item.url);
+            const localSize = fk.getLocalSize(item.path);
+            console.log({ cloudSize, localSize });
             const upload = await task.createUploadTask({
                 filename: item.filename,
                 path: item.path,

package/dist/templates/tasks/schedule-task.js

@@ -75,6 +75,11 @@ class ScheduleTask extends rabbitmq_1.Task {
                     }
                 }
             });
+            // check status = 1
+            const waitUploadTask = await db.manager.find(entities_1.FkDownloadTaskEntity, { where: { status: 1 } });
+            // waitUploadTask.map(task => {
+            //     taskService.createUploadTask()
+            // })
         };
         await run();
         schedule.scheduleJob(task.name, task.rule, async (time) => {

package/dist/templates/tasks/upload-task.js

@@ -41,7 +41,9 @@ class UploadTask extends rabbitmq_1.Task {
             await complete();
             return next && next();
         }
-        if (!(0, fs_1.existsSync)(task.path) || !(old.fileMd5 && old.fileMd5.length > 0)) {
+        const cloudSize = await fk.getSize(old.url);
+        const localSize = fk.getLocalSize(old.path);
+        if (cloudSize != localSize) {
             await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 0 });
             const download = await taskService.createDownLoadTask(old.url, old.loginId, old.topicId);
             await manager.send(download);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.113",
+  "version": "1.0.116",
   "description": "",
   "main": "dist/core.js",
   "types": "dist/core.d.ts",