定时任务支持多个定时规则

whyour · Sep 15, 2023 · acc7443 · acc7443
1 parent 042d7d3
commit acc7443
Show file tree

Hide file tree

Showing 17 changed files with 306 additions and 275 deletions.
diff --git a/back/api/cron.ts b/back/api/cron.ts
@@ -176,6 +176,7 @@ export default (app: Router) => {
         name: Joi.string().optional(),
         labels: Joi.array().optional(),
         sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -333,6 +334,7 @@ export default (app: Router) => {
         schedule: Joi.string().required(),
         name: Joi.string().optional().allow(null),
         sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
         id: Joi.number().required(),
       }),
     }),

diff --git a/back/data/cron.ts b/back/data/cron.ts
@@ -18,6 +18,7 @@ export class Crontab {
   last_running_time?: number;
   last_execution_time?: number;
   sub_id?: number;
+  extra_schedules?: Array<{ schedule: string }>;
 
   constructor(options: Crontab) {
     this.name = options.name;
@@ -39,6 +40,7 @@ export class Crontab {
     this.last_running_time = options.last_running_time || 0;
     this.last_execution_time = options.last_execution_time || 0;
     this.sub_id = options.sub_id;
+    this.extra_schedules = options.extra_schedules;
   }
 }
 
@@ -49,7 +51,7 @@ export enum CrontabStatus {
   'disabled',
 }
 
-export interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
+export interface CronInstance extends Model<Crontab, Crontab>, Crontab { }
 export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
   name: {
     unique: 'compositeIndex',
@@ -75,4 +77,5 @@ export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
   last_running_time: DataTypes.NUMBER,
   last_execution_time: DataTypes.NUMBER,
   sub_id: { type: DataTypes.NUMBER, allowNull: true },
+  extra_schedules: DataTypes.JSON
 });
diff --git a/back/loaders/db.ts b/back/loaders/db.ts
@@ -48,7 +48,10 @@ export default async () => {
     } catch (error) {}
     try {
       await sequelize.query('alter table Crontabs add column sub_id NUMBER');
-    } catch (error) {}
+    } catch (error) { }
+    try {
+      await sequelize.query('alter table Crontabs add column extra_schedules JSON');
+    } catch (error) { }
 
     // 2.10-2.11 升级
     const cronDbFile = path.join(config.rootPath, 'db/crontab.db');

diff --git a/back/protos/cron.proto b/back/protos/cron.proto
@@ -7,10 +7,13 @@ service Cron {
   rpc delCron(DeleteCronRequest) returns (DeleteCronResponse);
 }
 
+message ISchedule { string schedule = 1; }
+
 message ICron {
   string id = 1;
   string schedule = 2;
   string command = 3;
+  repeated ISchedule extra_schedules = 4;
 }
 
 message AddCronRequest { repeated ICron crons = 1; }