diff --git a/packages/ui/certd-server/src/plugins/plugin-doge/lib/index.ts b/packages/ui/certd-server/src/plugins/plugin-doge/lib/index.ts index 079dd264..60de94b7 100644 --- a/packages/ui/certd-server/src/plugins/plugin-doge/lib/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-doge/lib/index.ts @@ -13,7 +13,7 @@ export class DogeClient { this.http = http; } - async request(apiPath: string, data: any = {}, jsonMode = false) { + async request(apiPath: string, data: any = {}, jsonMode = false, ignoreResNullCode = false) { // 这里替换为你的多吉云永久 AccessKey 和 SecretKey,可在用户中心 - 密钥管理中查看 // 请勿在客户端暴露 AccessKey 和 SecretKey,那样恶意用户将获得账号完全控制权 @@ -34,7 +34,9 @@ export class DogeClient { }, }); - if (res.code !== 200) { + if (res.code == null && ignoreResNullCode) { + //ignore + } else if (res.code !== 200) { throw new Error('API Error: ' + res.msg); } return res.data; diff --git a/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts index ee6be7a8..20e5e9c1 100644 --- a/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts @@ -44,6 +44,17 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin { }) accessId!: string; + @TaskInput({ + title: '忽略部署接口报错', + helper: '当该域名部署后报错,但是实际上已经部署成功时,可以勾选', + value: false, + component: { + name: 'a-switch', + type: 'checked', + }, + }) + ignoreDeployNullCode = false; + dogeClient!: DogeClient; async onInstance() { @@ -66,10 +77,14 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin { } async bindCert(certId: number) { - await this.dogeClient.request('/cdn/cert/bind.json', { - id: certId, - domain: this.domain, - }); + await this.dogeClient.request( + '/cdn/cert/bind.json', + { + id: certId, + domain: this.domain, + }, + this.ignoreDeployNullCode + ); } } new DogeCloudDeployToCDNPlugin(); diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts index d54c3893..7b598547 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts @@ -6,7 +6,7 @@ import dayjs from 'dayjs'; name: 'DeployCertToTencentCLB', title: '部署到腾讯云CLB', group: pluginGroups.tencent.key, - desc: '暂时只支持单向认证证书,暂时只支持通用负载均衡', + desc: '暂时只支持单向认证证书,暂时只支持通用负载均衡,必须开启sni', default: { strategy: { runStrategy: RunStrategy.SkipWhenSucceed, @@ -93,14 +93,13 @@ export class DeployToClbPlugin extends AbstractTaskPlugin { accessId!: string; client: any; - ClbClient: any; async onInstance() { this.client = await this.getClient(); } async getClient() { const sdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/clb/v20180317/index.js'); - this.ClbClient = sdk.v20180317.Client; + const ClbClient = sdk.v20180317.Client; const accessProvider = (await this.accessService.getById(this.accessId)) as TencentAccess; @@ -118,7 +117,7 @@ export class DeployToClbPlugin extends AbstractTaskPlugin { }, }; - return new this.ClbClient(clientConfig); + return new ClbClient(clientConfig); } async execute(): Promise { diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts index 935baa4a..a8e2ca9f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts @@ -1,6 +1,5 @@ import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline'; import dayjs from 'dayjs'; -import { tke } from 'tencentcloud-sdk-nodejs'; @IsTaskPlugin({ name: 'DeployCertToTencentTKEIngress',