github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复阿里云 esa 证书获取站点列表错误的问题

pull/409/head
xiaojunnuo 2025-05-28 16:06:38 +08:00
parent 45814ceb49
commit 0c2ea5da4c
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/plugins/plugin-lib/package.json
View File

@ -16,7 +16,6 @@
"pub": "npm publish" "pub": "npm publish"
}, },
"dependencies": { "dependencies": {
"@alicloud/credentials": "^2.4.3",
"@alicloud/openapi-client": "^0.4.14", "@alicloud/openapi-client": "^0.4.14",
"@alicloud/pop-core": "^1.7.10", "@alicloud/pop-core": "^1.7.10",
"@alicloud/tea-util": "^1.4.10", "@alicloud/tea-util": "^1.4.10",

20
packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts
View File

@ -13,7 +13,6 @@ export type AliyunClientV2Req = {
pathname?: `/`; pathname?: `/`;
data?: any; data?: any;
query?: any;
}; };
export class AliyunClientV2 { export class AliyunClientV2 {
access: AliyunAccess; access: AliyunAccess;
@ -32,15 +31,15 @@ export class AliyunClientV2 {
return this.client; return this.client;
} }
const $OpenApi = await import("@alicloud/openapi-client"); const $OpenApi = await import("@alicloud/openapi-client");
const Credential = await import("@alicloud/credentials"); // const Credential = await import("@alicloud/credentials");
//@ts-ignore // //@ts-ignore
const credential = new Credential.default.default({ // const credential = new Credential.default.default({
//
// type: "access_key",
// });
const config = new $OpenApi.Config({
accessKeyId: this.access.accessKeyId, accessKeyId: this.access.accessKeyId,
accessKeySecret: this.access.accessKeySecret, accessKeySecret: this.access.accessKeySecret,
type: "access_key",
});
const config = new $OpenApi.Config({
credential,
}); });
// Endpoint 请参考 https://api.aliyun.com/product/FC // Endpoint 请参考 https://api.aliyun.com/product/FC
// config.endpoint = `esa.${this.regionId}.aliyuncs.com`; // config.endpoint = `esa.${this.regionId}.aliyuncs.com`;
@ -76,10 +75,7 @@ export class AliyunClientV2 {
}); });
const runtime = new $Util.RuntimeOptions({}); const runtime = new $Util.RuntimeOptions({});
const request = new $OpenApi.OpenApiRequest({ const request = new $OpenApi.OpenApiRequest(req.data);
body: req.data,
query: req.query,
});
// 复制代码运行请自行打印 API 的返回值 // 复制代码运行请自行打印 API 的返回值
// 返回值实际为 Map 类型，可从 Map 中获得三类数据：响应体 body、响应头 headers、HTTP 返回的状态码 statusCode。 // 返回值实际为 Map 类型，可从 Map 中获得三类数据：响应体 body、响应头 headers、HTTP 返回的状态码 statusCode。
const res = await client.callApi(params, request, runtime); const res = await client.callApi(params, request, runtime);

26
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts
View File

@ -132,10 +132,12 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
// 接口版本 // 接口版本
version: "2024-09-10", version: "2024-09-10",
data: { data: {
SiteId: siteId, body:{
CasId: certId, SiteId: siteId,
Type: "cas", CasId: certId,
Name: certName Type: "cas",
Name: certName
}
} }
}); });
this.logger.info(`部署站点[${siteId}]证书成功：${JSON.stringify(res)}`); this.logger.info(`部署站点[${siteId}]证书成功：${JSON.stringify(res)}`);
@ -197,8 +199,10 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
action: "ListCertificates", action: "ListCertificates",
version: "2024-09-10", version: "2024-09-10",
method: "GET", method: "GET",
query: { data:{
SiteId: siteId query: {
SiteId: siteId
}
} }
}); });
@ -212,10 +216,12 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
version: "2024-09-10", version: "2024-09-10",
// 接口 HTTP 方法 // 接口 HTTP 方法
method: "GET", method: "GET",
query: { data:{
SiteId: siteId, query: {
Id: item.id SiteId: siteId,
} Id: item.id
}
}
}); });
this.logger.info(`证书${item.Name}已删除`); this.logger.info(`证书${item.Name}已删除`);
} }