diff --git a/packages/ui/certd-server/src/modules/auto/auto-pipeline-emitter-register.ts b/packages/ui/certd-server/src/modules/auto/auto-pipeline-emitter-register.ts index 12605c94a..32a23b089 100644 --- a/packages/ui/certd-server/src/modules/auto/auto-pipeline-emitter-register.ts +++ b/packages/ui/certd-server/src/modules/auto/auto-pipeline-emitter-register.ts @@ -15,8 +15,8 @@ export class AutoPipelineEmitterRegister { } async onCertApplySuccess() { - pipelineEmitter.on(EVENT_CERT_APPLY_SUCCESS, async (event: PipelineEvent<{ cert: CertInfo; file: string }>) => { - await this.certInfoService.updateCertByPipelineId(event.pipeline.id, event.event.cert, event.event.file); + pipelineEmitter.on(EVENT_CERT_APPLY_SUCCESS, async (event: PipelineEvent<{ cert: CertInfo }>) => { + await this.certInfoService.updateCertByPipelineId(event.pipeline.id, event.event.cert); }); } } diff --git a/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts b/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts index d8f4807bb..8bb13c84f 100644 --- a/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts +++ b/packages/ui/certd-server/src/modules/monitor/entity/cert-info.ts @@ -42,6 +42,7 @@ export class CertInfoEntity { @Column({ name: "cert_info", comment: "证书详情" }) certInfo: string; + // Deprecated 废弃 @Column({ name: "cert_file", comment: "证书下载" }) certFile: string; 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 ab074be8f..ce68cb5db 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 @@ -12,7 +12,6 @@ export type UploadCertReq = { fromType?: string; userId?: number; projectId?: number; - file?: any; }; @Provide("CertInfoService") @@ -158,7 +157,7 @@ export class CertInfoService extends BaseService { }; } - async updateCertByPipelineId(pipelineId: number, cert: CertInfo, file?: string, fromType = "pipeline") { + async updateCertByPipelineId(pipelineId: number, cert: CertInfo, fromType = "pipeline") { const found = await this.repository.findOne({ where: { pipelineId, @@ -168,7 +167,6 @@ export class CertInfoService extends BaseService { id: found?.id, certReader: new CertReader(cert), fromType, - file, }); return bean; } @@ -194,9 +192,6 @@ export class CertInfoService extends BaseService { bean.certProvider = certReader.detail.issuer.commonName; bean.userId = userId; bean.projectId = req.projectId; - if (req.file) { - bean.certFile = req.file; - } await this.addOrUpdate(bean); return bean; } diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts index 1314e38d5..589bf0024 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/base-convert.ts @@ -84,7 +84,6 @@ export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin { const emitter = this.ctx.emitter; const value = { cert: this.cert, - file: this._result.files[0].path, }; await emitter.emit(EVENT_CERT_APPLY_SUCCESS, value); }