@nger/fk-upload 1.0.215 → 1.0.218

package/dist/services/fk.service.js

@@ -99,7 +99,7 @@ let FkService = class FkService {
                 [`Cookie`]: fkAccount.cookies
             }
         }).then(res => res.data);
-        if (info.code === 200) {
+        if (info && info.code === 200) {
             let forceDirect = true;
             if (download.size > 2097152) {
                 forceDirect = false;
@@ -219,19 +219,19 @@ let FkService = class FkService {
                 }).catch((e) => {
                     sub.error(e);
                 });
-                if (uploadResult.code !== 200) {
-                    if (uploadResult.data) {
-                        const data = uploadResult.data;
-                        if (data.limit) {
-                            // to big
-                            sub.error(`文件太大上传失败`);
-                            break;
+                if (uploadResult) {
+                    if (uploadResult.code !== 200) {
+                        if (uploadResult.data) {
+                            const data = uploadResult.data;
+                            if (data.limit) {
+                                // to big
+                                sub.error(`文件太大上传失败`);
+                                break;
+                            }
                         }
+                        sub.error(new Error(uploadResult.msg));
+                        break;
                     }
-                    sub.error(new Error(uploadResult.msg));
-                    break;
-                }
-                if (uploadResult) {
                     const data = uploadResult.data;
                     const fullDownUrl = data.fullDownUrl;
                     if (fullDownUrl) {

package/dist/tasks/check-task.js

@@ -105,6 +105,7 @@ class CheckTask extends rabbitmq_1.Task {
                     await finish(`人为关闭`);
                     return;
                 }
+                await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
                 console.log(`run in schedule: ${time}-${runtimeCheck.status}-${runtimeCheck.type}`);
                 if (type === 'create_download') {
                     const now = new Date().getTime() - 1000 * 60 * 60 * 24 * 8;
@@ -132,9 +133,6 @@ class CheckTask extends rabbitmq_1.Task {
                         const downloadService = injector.get(download_service_1.DownloadService);
                         await downloadService.startDownload(one.id);
                     }
-                    await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
-                    // await finish(`执行完成`)
-                    // await create();
                 }
                 else if (type === 'create_upload') {
                     // create upload
@@ -153,10 +151,6 @@ class CheckTask extends rabbitmq_1.Task {
                     if (waitUploads) {
                         await uploadService.startUpload(waitUploads.id);
                     }
-                    // downloadService.startDownload()
-                    await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
-                    // await finish(`执行完成`)
-                    // await create();
                 }
                 else if (type === 'create_effect') {
                     const list = await db.manager.find(upload_task_1.FkUploadTask, { where: { status: '7', isEffect: false } });
@@ -174,9 +168,6 @@ class CheckTask extends rabbitmq_1.Task {
                     if (waitEffects) {
                         await effectService.start(waitEffects.id);
                     }
-                    await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
-                    // await finish(`执行完成`)
-                    // await create();
                 }
                 else {
                     await finish(`未知任务`);

package/dist/tasks/download-task.js

@@ -109,9 +109,8 @@ class DownloadTask extends rabbitmq_1.Task {
             const headers = resp.headers;
             total = Number(headers["content-length"]);
             if (total > 1024 * 1024 * 1024) {
-                sub.error(new Error(`文件超出1G`));
-                await _defer;
                 await db.manager.update(download_task_1.FkDownloadTask, download.id, { isBigFile: true, desc: '文件超出1G', status: `6` });
+                sub.error(new Error(`文件超出1G`));
                 return;
             }
             const useSize = download.w7Account.fkAccount.usedSize + total;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.215",
+  "version": "1.0.218",
   "description": "nger fk upload",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
@@ -17,19 +17,19 @@
   "author": "imeepos",
   "license": "ISC",
   "dependencies": {
-    "@nger/api": "^1.0.0",
-    "@nger/main": "^1.0.0",
-    "@nger/setting": "^1.0.0",
-    "@nger/menu": "^1.0.0",
-    "@nger/core": "^1.0.0",
-    "@nger/http": "^4.0.0",
-    "@nger/rabbitmq": "^1.0.0",
-    "@nger/redis": "^1.0.0",
-    "@nger/rest": "^1.0.0",
-    "@nger/schedule": "^1.0.0",
-    "@nger/typeorm": "^1.0.0",
-    "@nger/w7": "^1.0.0",
-    "@nger/ws": "^1.0.0",
+    "@nger/api": "1.0.19",
+    "@nger/main": "1.0.31",
+    "@nger/setting": "1.0.1",
+    "@nger/menu": "1.0.16",
+    "@nger/core": "1.10.29",
+    "@nger/http": "4.0.50",
+    "@nger/rabbitmq": "1.0.41",
+    "@nger/redis": "1.0.3",
+    "@nger/rest": "1.0.105",
+    "@nger/schedule": "1.0.5",
+    "@nger/typeorm": "1.0.12",
+    "@nger/w7": "1.0.5",
+    "@nger/ws": "1.0.10",
     "axios": "^0.26.1",
     "date-fns": "^2.28.0",
     "form-data": "^4.0.0",

package/pnpm-lock.yaml

@@ -1,19 +1,19 @@
 lockfileVersion: 5.3
 
 specifiers:
-  '@nger/api': workspace:^1.0.0
-  '@nger/core': workspace:^1.0.0
-  '@nger/http': workspace:^4.0.0
-  '@nger/main': workspace:^1.0.0
-  '@nger/menu': workspace:^1.0.0
-  '@nger/rabbitmq': workspace:^1.0.0
-  '@nger/redis': workspace:^1.0.0
-  '@nger/rest': workspace:^1.0.0
-  '@nger/schedule': workspace:^1.0.0
-  '@nger/setting': workspace:^1.0.0
-  '@nger/typeorm': workspace:^1.0.0
-  '@nger/w7': workspace:^1.0.0
-  '@nger/ws': workspace:^1.0.0
+  '@nger/api': workspace:*
+  '@nger/core': workspace:*
+  '@nger/http': workspace:*
+  '@nger/main': workspace:*
+  '@nger/menu': workspace:*
+  '@nger/rabbitmq': workspace:*
+  '@nger/redis': workspace:*
+  '@nger/rest': workspace:*
+  '@nger/schedule': workspace:*
+  '@nger/setting': workspace:*
+  '@nger/typeorm': workspace:*
+  '@nger/w7': workspace:*
+  '@nger/ws': workspace:*
   '@types/react': ^18.0.8
   '@types/request': ^2.48.8
   axios: ^0.26.1