@nger/fk-upload 1.0.214 → 1.0.217

package/dist/main.js

@@ -7,25 +7,13 @@ require("reflect-metadata");
 require('dotenv').config();
 const main_1 = require("@nger/main");
 const core_1 = require("@nger/core");
-const sirv_1 = require("@nger/sirv");
-const rest_1 = require("@nger/rest");
-const upload_1 = require("@nger/upload");
-const rabbitmq_1 = require("@nger/rabbitmq");
 const fk_upload_module_1 = require("./fk-upload.module");
-const menu_1 = require("@nger/menu");
-const setting_1 = require("@nger/setting");
 let AppModule = class AppModule {
 };
 AppModule = tslib_1.__decorate([
     (0, core_1.Module)({
         imports: [
-            rabbitmq_1.RabbitMqModule.forEnv(),
-            sirv_1.SirvModule.forRoot(),
-            rest_1.RestModule,
-            upload_1.UploadModule,
-            fk_upload_module_1.FkUploadModule,
-            menu_1.MenuModule,
-            setting_1.SettingModule
+            fk_upload_module_1.FkUploadModule
         ]
     })
 ], AppModule);

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/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.214",
+  "version": "1.0.217",
   "description": "nger fk upload",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",