@nger/fk-upload 1.0.205 → 1.0.208

package/dist/main.js

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

package/dist/tasks/check-task.js

@@ -33,7 +33,6 @@ class CheckTask extends rabbitmq_1.Task {
             complete();
             return next && next();
         }
-        console.log({ from, to, id, status: check.status });
         const manager = injector.get(rabbitmq_1.TaskManager);
         if (this.ids.has(id)) {
             complete();
@@ -41,13 +40,12 @@ class CheckTask extends rabbitmq_1.Task {
         }
         if (check.status === '1') {
             let job;
-            console.log(`work start ------- \n\n\n`);
             this.ids.add(task.id);
             const finish = async (reson) => {
                 this.ids.delete(check.id);
                 await db.manager.update(check_task_1.FkCheckTask, check.id, { status: `1`, desc: reson });
-                complete();
                 schedule.cancelJob(check.title);
+                complete();
             };
             const create = async () => {
                 const item = new rabbitmq_1.TaskEntity();
@@ -97,23 +95,22 @@ class CheckTask extends rabbitmq_1.Task {
             const id = check.id;
             const count = check.count;
             async function run(time) {
-                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`) {
                     await finish(`人为关闭`);
                     return;
                 }
+                console.log({ time, from, to, id, status: runtimeCheck.status });
                 if (type === 'create_download') {
                     const now = new Date().getTime() - 1000 * 60 * 60 * 24 * 8;
                     (0, date_fns_1.format)(now, 'yyyy');
                     const _from = (0, date_fns_1.format)(now, 'yyyy-MM-dd HH:mm:ss');
                     const nowTime = Math.floor(now / 1000);
                     const downloads = await db.manager.find(download_task_1.FkDownloadTask, { where: { createDate: (0, typeorm_2.MoreThan)(_from) } });
-                    console.log(downloads.length);
                     const ids = downloads.map(it => it.topicId).filter(it => !!it);
                     const where = { uniacid, createTime: (0, typeorm_2.MoreThan)(nowTime) };
                     if (ids.length > 0) {
@@ -135,8 +132,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 +154,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,26 +174,20 @@ 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(`未知任务`);
                 }
             }
+            run(new Date());
             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.205",
+  "version": "1.0.208",
   "description": "nger fk upload",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
@@ -19,6 +19,7 @@
   "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",

package/pnpm-lock.yaml

@@ -10,6 +10,7 @@ specifiers:
   '@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
@@ -35,6 +36,7 @@ dependencies:
   '@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