perf: 批量设置定时,支持清除定时

This commit is contained in:
xiaojunnuo
2025-12-16 00:21:31 +08:00
parent e4e16bc6a6
commit 63d8bcf882
5 changed files with 72 additions and 27 deletions
@@ -121,6 +121,7 @@ export class EmailService implements IEmailService {
data: {
title: '测试邮件,from certd',
content: '测试邮件,from certd',
url:"https://certd.handfree.work",
},
email: {
receivers: [receiver],
@@ -128,7 +128,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
}
const pipeline = JSON.parse(item.content);
let stepCount = 0;
if(pipeline.stages){
if (pipeline.stages) {
RunnableCollection.each(pipeline.stages, (runnable: any) => {
stepCount++;
});
@@ -237,7 +237,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
let fromType = "pipeline";
if (bean.type === "cert_upload") {
fromType = "upload";
}else if (bean.type === "cert_auto") {
} else if (bean.type === "cert_auto") {
fromType = "auto";
}
await this.certInfoService.updateDomains(pipeline.id, pipeline.userId || bean.userId, domains, fromType);
@@ -376,17 +376,17 @@ export class PipelineService extends BaseService<PipelineEntity> {
}
if (immediateTriggerOnce) {
try{
try {
await this.trigger(pipeline.id);
await sleep(200);
}catch(e){
} catch (e) {
logger.error(e);
}
}
}
async trigger(id: any, stepId?: string , doCheck = false) {
async trigger(id: any, stepId?: string, doCheck = false) {
const entity: PipelineEntity = await this.info(id);
if (doCheck) {
await this.beforeCheck(entity);
@@ -500,8 +500,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
async isPipelineValidTimeEnabled(entity: PipelineEntity) {
const settings = await this.sysSettingsService.getPublicSettings();
if (isPlus() && settings.pipelineValidTimeEnabled){
if (entity.validTime > 0 && entity.validTime < Date.now()){
if (isPlus() && settings.pipelineValidTimeEnabled) {
if (entity.validTime > 0 && entity.validTime < Date.now()) {
return false
}
}
@@ -524,7 +524,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
if (!validTimeEnabled) {
throw new Error(`流水线${entity.id}已过期,不予执行`);
}
let suite: UserSuiteEntity = null;
if (isComm()) {
suite = await this.checkHasDeployCount(entity.id, entity.userId);
@@ -538,8 +538,8 @@ export class PipelineService extends BaseService<PipelineEntity> {
async doRun(entity: PipelineEntity, triggerId: string, stepId?: string) {
let suite:any = null
try{
let suite: any = null
try {
const res = await this.beforeCheck(entity);
suite = res.suite
} catch (e) {
@@ -803,11 +803,17 @@ export class PipelineService extends BaseService<PipelineEntity> {
for (const item of list) {
const pipeline = JSON.parse(item.content);
pipeline.triggers = [{
id: nanoid(),
title: "定时触发",
...trigger
}];
if (trigger.props === false) {
//清除trigger
pipeline.triggers = []
} else {
pipeline.triggers = [{
id: nanoid(),
title: "定时触发",
...trigger
}];
}
await this.doUpdatePipelineJson(item, pipeline);
}
@@ -919,20 +925,20 @@ export class PipelineService extends BaseService<PipelineEntity> {
}
}
async createAutoPipeline(req: { domains: string[]; email: string; userId: number ,from:string}) {
async createAutoPipeline(req: { domains: string[]; email: string; userId: number, from: string }) {
const randomHour = Math.floor(Math.random() * 6);
const randomMin = Math.floor(Math.random() * 60);
const randomCron = `0 ${randomMin} ${randomHour} * * *`;
let pipeline: any = {
title: req.domains[0] + `证书自动申请【${req.from??"OpenAPI"}`,
title: req.domains[0] + `证书自动申请【${req.from ?? "OpenAPI"}`,
runnableType: "pipeline",
triggers: [
{
id: nanoid(),
title: "定时触发",
props:{
props: {
cron: randomCron,
},
type: "timer"
@@ -25,13 +25,16 @@ export class EmailNotification extends BaseNotification {
const templateData = {
...body,
}
const emailSend:any = {
receivers: this.receivers,
}
if (body.attachments && body.attachments.length > 0) {
emailSend.attachments = body.attachments;
}
await this.ctx.emailService.sendByTemplate({
type: body.notificationType,
data: templateData,
email: {
receivers: this.receivers,
attachments: body.attachments,
}
email: emailSend
})
// await this.ctx.emailService.send({
@@ -61,8 +61,14 @@ export class BaseEmailTemplateProvider extends BaseAddon implements ITemplatePro
async buildContent(params: BuildContentReq): Promise<EmailContent> {
const title = this.compile(this.titleTemplate)(params.data)
const content = this.compile(this.contentTemplate)(params.data)
const data = {
title:"",
content:"",
url:"",
...params.data,
}
const title = this.compile(this.titleTemplate)(data)
const content = this.compile(this.contentTemplate)(data)
const body: any = {
subject: title,