diff --git a/packages/ui/certd-server/src/plugins/plugin-west/access.ts b/packages/ui/certd-server/src/plugins/plugin-west/access.ts index cbfb59300..41cbc8b3d 100644 --- a/packages/ui/certd-server/src/plugins/plugin-west/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-west/access.ts @@ -158,6 +158,9 @@ export class WestAccess extends BaseAccess { }, }); if (res.msg !== 'success') { + if(res.msg.includes('500 already exists')){ + return res; + } throw new Error(`${JSON.stringify(res.msg)}`); } return res; @@ -253,6 +256,9 @@ token=md5(zhangsan + 5dh232kfg!* + 1554691950854)=cfcd208495d565ef66e7dff9f98764 }); this.ctx.logger.info(`request ${url} ${method} res:${JSON.stringify(res)}`); if (res.msg !== 'success' && res.result!= 200) { + if(res.msg.includes('500 already exists')){ + return res; + } throw new Error(`${JSON.stringify(res.msg)}`); } return res; diff --git a/packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts index 9d922e898..5f99e10cb 100644 --- a/packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts +++ b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider-domain.ts @@ -73,11 +73,16 @@ export class WestDnsProviderDomain extends AbstractDnsProvider { } //这里调用删除txt dns解析记录接口 + const record_id = record?.body?.record_id; + if (!record_id) { + this.logger.info('record_id不存在'); + return; + } // 准备要发送到API的请求体 const requestBody = { act: 'dnsrec.remove', // API动作类型 domain: domain, // 域名 - record_id: record.body.record_id, + record_id: record_id, hostname: fullRecord, // 完整的记录名 record_type: 'TXT', // DNS记录类型 record_line: '', // 记录线路 diff --git a/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts index 1d2ab6abc..86d59aa85 100644 --- a/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-west/dns-provider.ts @@ -107,12 +107,16 @@ export class WestDnsProvider extends AbstractDnsProvider { return; } //这里调用删除txt dns解析记录接口 - + const record_id = record.data?.id; + if (!record_id) { + this.logger.info('record_id不存在'); + return; + } // 准备要发送到API的请求体 const requestBody = { act: 'deldnsrecord', // API动作类型 domain: domain, // 域名 - id: record.data?.id, + id: record_id, }; const url = '/v2/domain/';