修复定时删除日志

back/services/schedule.ts

@@ -3,24 +3,33 @@ import winston from 'winston';
 import nodeSchedule from 'node-schedule';
 import { Crontab } from '../data/cron';
 import { exec } from 'child_process';
+import {
+  ToadScheduler,
+  SimpleIntervalJob,
+  Task,
+  SimpleIntervalSchedule,
+} from 'toad-scheduler';
 
 @Service()
 export default class ScheduleService {
-  private scheduleStacks = new Map<number, nodeSchedule.Job>();
+  private scheduleStacks = new Map<string, nodeSchedule.Job>();
+
+  private intervalSchedule = new ToadScheduler();
 
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  async generateSchedule({ id = 0, command, name, schedule }: Crontab) {
+  async createCronTask({ id = 0, command, name, schedule = '' }: Crontab) {
+    const _id = this.formatId(id);
     this.logger.info(
-      '[创建定时任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
-      id,
+      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
+      _id,
       schedule,
       name,
       command,
     );
 
     this.scheduleStacks.set(
-      id,
+      _id,
       nodeSchedule.scheduleJob(id + '', schedule, async () => {
         try {
           exec(command, async (error, stdout, stderr) => {
@@ -55,8 +64,67 @@ export default class ScheduleService {
     );
   }
 
-  async cancelSchedule({ id = 0, name }: Crontab) {
+  async cancelCronTask({ id = 0, name }: Crontab) {
+    const _id = this.formatId(id);
     this.logger.info('[取消定时任务]，任务名：%s', name);
-    this.scheduleStacks.has(id) && this.scheduleStacks.get(id)?.cancel();
+    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
+  }
+
+  async createIntervalTask(
+    { id = 0, command, name = '' }: Crontab,
+    schedule: SimpleIntervalSchedule,
+  ) {
+    const _id = this.formatId(id);
+    this.logger.info(
+      '[创建interval任务]，任务ID: %s，任务名: %s，执行命令: %s',
+      _id,
+      name,
+      command,
+    );
+    const task = new Task(name, async () => {
+      try {
+        exec(command, async (error, stdout, stderr) => {
+          if (error) {
+            await this.logger.info(
+              '执行任务%s失败，时间：%s, 错误信息：%j',
+              command,
+              new Date().toLocaleString(),
+              error,
+            );
+          }
+
+          if (stderr) {
+            await this.logger.info(
+              '执行任务%s失败，时间：%s, 错误信息：%j',
+              command,
+              new Date().toLocaleString(),
+              stderr,
+            );
+          }
+        });
+      } catch (error) {
+        await this.logger.info(
+          '执行任务%s失败，时间：%s, 错误信息：%j',
+          command,
+          new Date().toLocaleString(),
+          error,
+        );
+      } finally {
+      }
+    });
+
+    const job = new SimpleIntervalJob({ ...schedule }, task, _id);
+
+    this.intervalSchedule.addIntervalJob(job);
+  }
+
+  async cancelIntervalTask({ id = 0, name }: Crontab) {
+    const _id = this.formatId(id);
+    this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
+    this.intervalSchedule.removeById(_id);
+  }
+
+  private formatId(id: number): string {
+    return String(id);
   }
 }

back/services/system.ts

@@ -24,7 +24,7 @@ export default class SystemService {
 
   public async getLogRemoveFrequency() {
     const doc = await this.getDb({ type: AuthDataType.removeLogFrequency });
-    return (doc && doc.info) || {};
+    return doc || {};
   }
 
   private async updateAuthDb(payload: AuthInfo): Promise<any> {
@@ -65,11 +65,13 @@ export default class SystemService {
       id: result.id,
       name: '删除日志',
       command: `ql rmlog ${frequency}`,
-      schedule: `5 23 */${frequency} * *`,
     };
-    await this.scheduleService.cancelSchedule(cron);
+    await this.scheduleService.cancelIntervalTask(cron);
     if (frequency > 0) {
-      await this.scheduleService.generateSchedule(cron);
+      await this.scheduleService.createIntervalTask(cron, {
+        days: frequency,
+        runImmediately: true,
+      });
     }
     return { code: 200, data: { ...cron } };
   }

back/services/user.ts

@@ -360,9 +360,9 @@ export default class UserService {
       command: `ql rmlog ${frequency}`,
       schedule: `5 23 */${frequency} * *`,
     };
-    await this.scheduleService.cancelSchedule(cron);
+    await this.scheduleService.cancelCronTask(cron);
     if (frequency > 0) {
-      await this.scheduleService.generateSchedule(cron);
+      await this.scheduleService.createCronTask(cron);
     }
     return { code: 200, data: { ...cron } };
   }