mirror of
https://github.com/certd/certd.git
synced 2026-05-15 20:47:31 +08:00
perf: 修复西数解析记录添加失败的bug,支持部署证书到西数虚拟主机
This commit is contained in:
@@ -4,10 +4,10 @@ import { WestAccess } from './access.js';
|
||||
|
||||
type westRecord = {
|
||||
// 这里定义Record记录的数据结构,跟对应云平台接口返回值一样即可,一般是拿到id就行,用于删除txt解析记录,清理申请痕迹
|
||||
code: number;
|
||||
result: number;
|
||||
msg: string;
|
||||
body: {
|
||||
record_id: number;
|
||||
data: {
|
||||
id: number;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -31,27 +31,6 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
|
||||
//...
|
||||
}
|
||||
|
||||
private async doRequestApi(url: string, data: any = null, method = 'post') {
|
||||
if (this.access.scope === 'account') {
|
||||
data.apikey = this.ctx.utils.hash.md5(this.access.apikey);
|
||||
data.username = this.access.username;
|
||||
} else {
|
||||
data.apidomainkey = this.access.apidomainkey;
|
||||
}
|
||||
const res = await this.ctx.http.request<any, any>({
|
||||
url,
|
||||
method,
|
||||
data,
|
||||
headers: {
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
},
|
||||
});
|
||||
if (res.msg !== 'success') {
|
||||
throw new Error(`${JSON.stringify(res.msg)}`);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建dns解析记录,用于验证域名所有权
|
||||
*/
|
||||
@@ -63,22 +42,26 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
|
||||
* type: 'TXT',
|
||||
* domain: 'example.com'
|
||||
*/
|
||||
const { fullRecord, value, type, domain } = options;
|
||||
const { fullRecord, value, type, domain,hostRecord } = options;
|
||||
this.logger.info('添加域名解析:', fullRecord, value, type, domain);
|
||||
|
||||
// 准备要发送到API的请求体
|
||||
const requestBody = {
|
||||
act: 'dnsrec.add', // API动作类型
|
||||
act: 'adddnsrecord', // API动作类型
|
||||
domain: domain, // 域名
|
||||
record_type: 'TXT', // DNS记录类型
|
||||
hostname: fullRecord, // 完整的记录名
|
||||
record_value: value, // 记录的值
|
||||
record_line: '', // 记录线路
|
||||
record_ttl: 60, // TTL (生存时间),设置为60秒
|
||||
type: 'TXT', // DNS记录类型
|
||||
host: hostRecord, // 完整的记录名
|
||||
value: value, // 记录的值
|
||||
line: '', // 记录线路
|
||||
ttl: 60, // TTL (生存时间),设置为60秒
|
||||
};
|
||||
|
||||
const url = 'https://api.west.cn/API/v2/domain/dns/';
|
||||
const res = await this.doRequestApi(url, requestBody);
|
||||
const url = '/v2/domain/';
|
||||
const res = await this.access.doRequest({
|
||||
url,
|
||||
method:'POST',
|
||||
data: requestBody,
|
||||
});
|
||||
const record = res as westRecord;
|
||||
this.logger.info(`添加域名解析成功:fullRecord=${fullRecord},value=${value}`);
|
||||
this.logger.info(`dns解析记录:${JSON.stringify(record)}`);
|
||||
@@ -90,6 +73,7 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
|
||||
|
||||
/**
|
||||
* 删除dns解析记录,清理申请痕迹
|
||||
* https://console-docs.apipost.cn/preview/ab2c3103b22855ba/fac91d1e43fafb69?target_id=c4564349-6687-413d-a3d4-b0e8db5b34b2
|
||||
* @param options
|
||||
*/
|
||||
async removeRecord(options: RemoveRecordOptions<westRecord>): Promise<void> {
|
||||
@@ -104,16 +88,17 @@ export class WestDnsProvider extends AbstractDnsProvider<westRecord> {
|
||||
|
||||
// 准备要发送到API的请求体
|
||||
const requestBody = {
|
||||
act: 'dnsrec.remove', // API动作类型
|
||||
act: 'deldnsrecord', // API动作类型
|
||||
domain: domain, // 域名
|
||||
record_id: record.body.record_id,
|
||||
hostname: fullRecord, // 完整的记录名
|
||||
record_type: 'TXT', // DNS记录类型
|
||||
record_line: '', // 记录线路
|
||||
id: record.data?.id,
|
||||
};
|
||||
|
||||
const url = 'https://api.west.cn/API/v2/domain/dns/';
|
||||
const res = await this.doRequestApi(url, requestBody);
|
||||
const url = '/v2/domain/';
|
||||
const res = await this.access.doRequest({
|
||||
url,
|
||||
method:'POST',
|
||||
data: requestBody,
|
||||
});
|
||||
const result = res.result;
|
||||
this.logger.info('删除域名解析成功:', fullRecord, value, JSON.stringify(result));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user