@nger/fk-upload 1.0.204 → 1.0.207

package/dist/main.js

@@ -12,6 +12,8 @@ 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([
@@ -21,7 +23,9 @@ AppModule = tslib_1.__decorate([
             sirv_1.SirvModule.forRoot(),
             rest_1.RestModule,
             upload_1.UploadModule,
-            fk_upload_module_1.FkUploadModule
+            fk_upload_module_1.FkUploadModule,
+            menu_1.MenuModule,
+            setting_1.SettingModule
         ]
     })
 ], AppModule);

package/dist/tasks/check-task.js

@@ -100,7 +100,7 @@ class CheckTask extends rabbitmq_1.Task {
                 console.log(time);
                 const runtimeCheck = await db.manager.findOne(check_task_1.FkCheckTask, { where: { id } });
                 if (!runtimeCheck) {
-                    await finish(``);
+                    await finish(`人为关闭`);
                     return;
                 }
                 if (runtimeCheck.status !== `3`) {
@@ -135,8 +135,8 @@ class CheckTask extends rabbitmq_1.Task {
                         await downloadService.startDownload(one.id);
                     }
                     await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
-                    await finish(`执行完成`);
-                    await create();
+                    // await finish(`执行完成`)
+                    // await create();
                 }
                 else if (type === 'create_upload') {
                     // create upload
@@ -157,8 +157,8 @@ class CheckTask extends rabbitmq_1.Task {
                     }
                     // downloadService.startDownload()
                     await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
-                    await finish(`执行完成`);
-                    await create();
+                    // await finish(`执行完成`)
+                    // await create();
                 }
                 else if (type === 'create_effect') {
                     const list = await db.manager.find(upload_task_1.FkUploadTask, { where: { status: '7', isEffect: false } });
@@ -177,8 +177,8 @@ class CheckTask extends rabbitmq_1.Task {
                         await effectService.starts(waitEffects.map(it => it.id));
                     }
                     await db.manager.update(check_task_1.FkCheckTask, id, { count: count + 1 });
-                    await finish(`执行完成`);
-                    await create();
+                    // await finish(`执行完成`)
+                    // await create();
                 }
                 else {
                     await finish(`未知任务`);
@@ -186,17 +186,10 @@ class CheckTask extends rabbitmq_1.Task {
             }
             job = schedule.scheduleJob(check.title, check.time, async (time) => {
                 run(time);
-                /***
-                const manager = injector.get(TaskManager)
-                const i = new TaskEntity()
-                i.data = task;
-                i.topic = CHECK_ACTION;
-                await manager.send(i)
-                 */
             });
         }
         else {
-            await db.manager.update(check_task_1.FkCheckTask, task.id, { status: `1` });
+            // await db.manager.update(FkCheckTask, task.id, { status: `1` })
             complete();
             return next && next();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.204",
+  "version": "1.0.207",
   "description": "nger fk upload",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
@@ -19,6 +19,8 @@
   "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",

package/pnpm-lock.yaml

@@ -5,10 +5,12 @@ specifiers:
   '@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
@@ -29,10 +31,12 @@ dependencies:
   '@nger/core': link:../core
   '@nger/http': link:../http
   '@nger/main': link:../main
+  '@nger/menu': link:../@nger/menu
   '@nger/rabbitmq': link:../rabbitmq
   '@nger/redis': link:../redis
   '@nger/rest': link:../rest
   '@nger/schedule': link:../schedule
+  '@nger/setting': link:../@nger/settings
   '@nger/typeorm': link:../typeorm
   '@nger/w7': link:../w7
   '@nger/ws': link:../ws