chore: project

This commit is contained in:
xiaojunnuo
2026-02-14 00:08:13 +08:00
parent 956d68695c
commit d125eb56b3
3 changed files with 10 additions and 4 deletions

View File

@@ -105,7 +105,9 @@ export class PipelineController extends CrudController<PipelineService> {
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;

View File

@@ -40,11 +40,12 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
});
}
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<CertInfoEntity> {
//create
bean.pipelineId = pipelineId;
bean.userId = userId;
bean.projectId = projectId;
bean.fromType = fromType
if (!domains || domains.length === 0) {
return;

View File

@@ -256,7 +256,6 @@ export class PipelineService extends BaseService<PipelineEntity> {
}
await this.doUpdatePipelineJson(bean, pipeline);
//保存域名信息到certInfo表
let fromType = "pipeline";
if (bean.type === "cert_upload") {
@@ -264,7 +263,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
} 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<PipelineEntity> {
bean.content = JSON.stringify(pipeline);
await this.addOrUpdate(bean);
await this.registerTrigger(bean);
return bean
}
private async checkMaxPipelineCount(bean: PipelineEntity, pipeline: Pipeline, domains: string[]) {