diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts index 7d55ab0d1..9a7f3f90d 100644 --- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts +++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts @@ -105,7 +105,9 @@ export class PipelineController extends CrudController { async save(@Body(ALL) bean: { addToMonitorEnabled: boolean, addToMonitorDomains: string } & PipelineEntity) { const { userId ,projectId} = await this.getProjectUserIdWrite() if (bean.id > 0) { - await this.checkOwner(this.getService(), bean.id,"write",true); + const {userId,projectId} = await this.checkOwner(this.getService(), bean.id,"write",true); + bean.userId = userId; + bean.projectId = projectId; } else { bean.userId = userId; bean.projectId = projectId; diff --git a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts index 86b51fc83..32f8b31b4 100644 --- a/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts +++ b/packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts @@ -40,11 +40,12 @@ export class CertInfoService extends BaseService { }); } - async updateDomains(pipelineId: number, userId: number, domains: string[],fromType?:string) { + async updateDomains(pipelineId: number, userId: number, projectId: number, domains: string[],fromType?:string) { const found = await this.repository.findOne({ where: { pipelineId, userId, + projectId, }, }); const bean = new CertInfoEntity(); @@ -55,6 +56,7 @@ export class CertInfoService extends BaseService { //create bean.pipelineId = pipelineId; bean.userId = userId; + bean.projectId = projectId; bean.fromType = fromType if (!domains || domains.length === 0) { return; diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts index b6dd4a211..580bb6d7e 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts @@ -256,7 +256,6 @@ export class PipelineService extends BaseService { } await this.doUpdatePipelineJson(bean, pipeline); - //保存域名信息到certInfo表 let fromType = "pipeline"; if (bean.type === "cert_upload") { @@ -264,7 +263,9 @@ export class PipelineService extends BaseService { } else if (bean.type === "cert_auto") { fromType = "auto"; } - await this.certInfoService.updateDomains(pipeline.id, pipeline.userId || bean.userId, domains, fromType); + const userId = pipeline.userId || bean.userId; + const projectId = pipeline.projectId ?? bean.projectId ??null; + await this.certInfoService.updateDomains(pipeline.id, userId, projectId , domains, fromType); return { ...bean, version: pipeline.version, @@ -293,6 +294,7 @@ export class PipelineService extends BaseService { bean.content = JSON.stringify(pipeline); await this.addOrUpdate(bean); await this.registerTrigger(bean); + return bean } private async checkMaxPipelineCount(bean: PipelineEntity, pipeline: Pipeline, domains: string[]) {