From 1089aeab9e320cc21eb4cb4fff9d3ef6d8c29126 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sat, 31 Jan 2026 19:36:37 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=98=BF=E9=87=8C=E4=BA=91=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=AF=81=E4=B9=A6=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=B8=BA=E5=B8=A6region=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts | 4 ++-- .../plugins/plugin-aliyun/plugin/deploy-to-all/index.ts | 4 ++-- .../plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts | 4 ++-- .../plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts | 4 ++-- .../plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts | 4 ++-- .../plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts | 4 ++-- .../plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts | 4 ++-- .../plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts | 4 ++-- .../plugin-aliyun/plugin/upload-to-aliyun/index.ts | 4 ++-- .../src/plugins/plugin-lib/aliyun/lib/ssl-client.ts | 8 ++++++-- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts index 5bc18f23e..8576748c9 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts @@ -305,11 +305,11 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin { }); const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)); - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name: certName, cert: this.cert }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; } return certId; diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-all/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-all/index.ts index 885ffd55c..4411531aa 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-all/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-all/index.ts @@ -155,11 +155,11 @@ export class AliyunDeployCertToAll extends AbstractTaskPlugin { // let certId: any = this.cert; if (typeof this.cert === "object") { - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name: this.appendTimeSuffix("certd"), cert: this.cert, }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; } const jobId = await this.createDeployJob(sslClient, certId); diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts index 72c4205c3..482177d09 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts @@ -115,11 +115,11 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin { if (typeof this.cert === 'object') { // @ts-ignore const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)) - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name:certName, cert: this.cert, }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; } const client = await this.getClient(access); diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts index be3c5fadd..7156f41ad 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts @@ -119,11 +119,11 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin { certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)); - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name: certName, cert: this.cert }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; this.logger.info("上传证书成功", certId, certName); } return { diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts index 956e96092..066aa3dd7 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts @@ -294,11 +294,11 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin { const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)) - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name: certName, cert: this.cert, }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; } return certId; } diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts index b5967abba..16c784df3 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts @@ -212,11 +212,11 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin { certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)); - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name: certName, cert: this.cert }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; this.logger.info("上传证书成功", certId, certName); } return { diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts index 564e3123e..a7d4a5a12 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts @@ -251,11 +251,11 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin { if (typeof this.cert === 'object') { const name = this.appendTimeSuffix('certd'); - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name: name, cert: this.cert, }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; } return await sslClient.getCertInfo(certId); diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts index bed07278b..e9aa77503 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts @@ -152,11 +152,11 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin { endpoint: this.casEndpoint, }); - const certIdRes = await sslClient.uploadCert({ + const certIdRes = await sslClient.uploadCertificate({ name: this.buildCertName(CertReader.getMainDomain(this.cert.crt)), cert: this.cert, }); - certId = certIdRes.certId; + certId = certIdRes.certId as any; } const client = await this.getWafClient(access); diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts index a5bf6df30..07b9ed552 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts @@ -104,11 +104,11 @@ export class UploadCertToAliyun extends AbstractTaskPlugin { }else{ certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)) } - const certIdRes = await client.uploadCert({ + const certIdRes = await client.uploadCertificate({ name: certName, cert: this.cert, }); - this.aliyunCertId = certIdRes.certId as any; + this.aliyunCertId = certIdRes as any; } } //注册插件 diff --git a/packages/ui/certd-server/src/plugins/plugin-lib/aliyun/lib/ssl-client.ts b/packages/ui/certd-server/src/plugins/plugin-lib/aliyun/lib/ssl-client.ts index c3ddc5505..027accaed 100644 --- a/packages/ui/certd-server/src/plugins/plugin-lib/aliyun/lib/ssl-client.ts +++ b/packages/ui/certd-server/src/plugins/plugin-lib/aliyun/lib/ssl-client.ts @@ -98,7 +98,11 @@ export class AliyunSslClient { return `${certId}-${this.getCasRegionFromEndpoint(this.opts.endpoint)}`; } - async uploadCert(req: AliyunSslUploadCertReq) : Promise { + async uploadCert(req: AliyunSslUploadCertReq) { + const {certId} = await this.uploadCertificate(req); + return certId; + } + async uploadCertificate(req: AliyunSslUploadCertReq) : Promise { const client = await this.getClient(); const params = { Name: req.name, @@ -127,7 +131,7 @@ export class AliyunSslClient { // 上传证书到阿里云 this.logger.info(`开始上传证书`); const certName = CertReader.buildCertName(cert); - const res = await this.uploadCert({ + const res = await this.uploadCertificate({ name: certName, cert: cert });