@nger/fk-upload 1.0.100 → 1.0.103

package/dist/templates/check-upload.js

@@ -102,7 +102,7 @@ let CheckUploadController = class CheckUploadController {
         };
     }
     async checkFinish() {
-        const finishs = await this.db.manager.find(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { status: (0, typeorm_2.In)([1, 2, 3]) } });
+        const finishs = await this.db.manager.find(fk_download_task_entity_1.FkDownloadTaskEntity, { where: { uploadUrl: (0, typeorm_2.Not)((0, typeorm_2.IsNull)()) } });
         await Promise.all(finishs.map(finish => {
             const item = new rabbitmq_1.TaskEntity();
             item.topic = actions_1.CHECK_ACTION;

package/dist/templates/task-manage.js

@@ -16,6 +16,8 @@ function getStatusTitle(status) {
             return 'downloading';
         case 1:
             return 'uploading';
+        case 2:
+            return 'effecting';
         default:
             return 'finish';
     }

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

@@ -24,6 +24,9 @@ class CheckTask extends rabbitmq_1.Task {
             const uploadSize = await this.getSize(finishs.uploadUrl);
             const downloadSize = await this.getSize(finishs.url);
             if (uploadSize === downloadSize) {
+                if (finishs.status < 2) {
+                    await db.manager.update(fk_download_task_entity_1.FkDownloadTaskEntity, filename, { status: 2 });
+                }
                 await complete();
             }
             else {

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

@@ -64,6 +64,8 @@ class DownloadTask extends rabbitmq_1.Task {
             sub.complete();
             const fileMd5 = await (0, md5_file_1.default)(task.path);
             console.log(`file download success ${task.filename}: ${fileMd5}`);
+            const db = injector.get(typeorm_1.Db);
+            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { totalSize: total, fileMd5: fileMd5, status: 1, size: total });
             const uploadTask = await this.createUploadTask(task, total, fileMd5, injector);
             await manager.send(uploadTask);
             await complete();
@@ -82,8 +84,6 @@ class DownloadTask extends rabbitmq_1.Task {
             await next();
     }
     async createUploadTask(download, total, md5, injector) {
-        const db = injector.get(typeorm_1.Db);
-        await db.manager.update(entities_1.FkDownloadTaskEntity, download.filename, { totalSize: total, fileMd5: md5, status: 1, size: total });
         const fk = injector.get(fk_service_1.FkService);
         const info = await fk.getUploadInfo(download.loginId, download.filename, md5, total);
         if (info) {

package/package.json

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