open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-24 07:16:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复订阅任务参数

Browse Source
This commit is contained in:
whyour 2024-09-01 23:42:36 +08:00
parent c573186e34
commit 53ef0fe296
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/loaders/initTask.ts
View File

@ -58,6 +58,6 @@ export default async () => {
await subscriptionService.setSshConfig(); await subscriptionService.setSshConfig();
const subs = await subscriptionService.list(); const subs = await subscriptionService.list();
for (const sub of subs) { for (const sub of subs) {
subscriptionService.handleTask(sub, !sub.is_disabled); subscriptionService.handleTask(sub.get({ plain: true }), !sub.is_disabled);
} }
}; };

13
back/services/subscription.ts
View File

@ -3,6 +3,7 @@ import winston from 'winston';
import config from '../config'; import config from '../config';
import { import {
Subscription, Subscription,
SubscriptionInstance,
SubscriptionModel, SubscriptionModel,
SubscriptionStatus, SubscriptionStatus,
} from '../data/subscription'; } from '../data/subscription';
@ -44,7 +45,7 @@ export default class SubscriptionService {
public async list( public async list(
searchText?: string, searchText?: string,
ids?: string, ids?: string,
): Promise<Subscription[]> { ): Promise<SubscriptionInstance[]> {
let query = {}; let query = {};
const subIds = JSON.parse(ids || '[]'); const subIds = JSON.parse(ids || '[]');
if (searchText) { if (searchText) {
@ -207,12 +208,12 @@ export default class SubscriptionService {
public async create(payload: Subscription): Promise<Subscription> { public async create(payload: Subscription): Promise<Subscription> {
const tab = new Subscription(payload); const tab = new Subscription(payload);
const doc = await this.insert(tab); const doc = await this.insert(tab);
await this.handleTask(doc); await this.handleTask(doc.get({ plain: true }));
await this.setSshConfig(); await this.setSshConfig();
return doc; return doc;
} }
public async insert(payload: Subscription): Promise<Subscription> { public async insert(payload: Subscription): Promise<SubscriptionInstance> {
return await SubscriptionModel.create(payload, { returning: true }); return await SubscriptionModel.create(payload, { returning: true });
} }
@ -264,7 +265,7 @@ export default class SubscriptionService {
public async remove(ids: number[], query: { force?: boolean }) { public async remove(ids: number[], query: { force?: boolean }) {
const docs = await SubscriptionModel.findAll({ where: { id: ids } }); const docs = await SubscriptionModel.findAll({ where: { id: ids } });
for (const doc of docs) { for (const doc of docs) {
await this.handleTask(doc, false); await this.handleTask(doc.get({ plain: true }), false);
} }
await SubscriptionModel.destroy({ where: { id: ids } }); await SubscriptionModel.destroy({ where: { id: ids } });
await this.setSshConfig(); await this.setSshConfig();
@ -341,7 +342,7 @@ export default class SubscriptionService {
const docs = await SubscriptionModel.findAll({ where: { id: ids } }); const docs = await SubscriptionModel.findAll({ where: { id: ids } });
await this.setSshConfig(); await this.setSshConfig();
for (const doc of docs) { for (const doc of docs) {
await this.handleTask(doc, false); await this.handleTask(doc.get({ plain: true }), false);
} }
} }
@ -350,7 +351,7 @@ export default class SubscriptionService {
const docs = await SubscriptionModel.findAll({ where: { id: ids } }); const docs = await SubscriptionModel.findAll({ where: { id: ids } });
await this.setSshConfig(); await this.setSshConfig();
for (const doc of docs) { for (const doc of docs) {
await this.handleTask(doc); await this.handleTask(doc.get({ plain: true }));
} }
} }