diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index bee5ec39..a51a7788 100644 --- a/packages/plugins/plugin-lib/package.json +++ b/packages/plugins/plugin-lib/package.json @@ -16,7 +16,6 @@ "pub": "npm publish" }, "dependencies": { - "@alicloud/credentials": "^2.4.3", "@alicloud/openapi-client": "^0.4.14", "@alicloud/pop-core": "^1.7.10", "@alicloud/tea-util": "^1.4.10", diff --git a/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts b/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts index 231118af..6b0ce7ca 100644 --- a/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts +++ b/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts @@ -13,7 +13,6 @@ export type AliyunClientV2Req = { pathname?: `/`; data?: any; - query?: any; }; export class AliyunClientV2 { access: AliyunAccess; @@ -32,15 +31,15 @@ export class AliyunClientV2 { return this.client; } const $OpenApi = await import("@alicloud/openapi-client"); - const Credential = await import("@alicloud/credentials"); - //@ts-ignore - const credential = new Credential.default.default({ + // const Credential = await import("@alicloud/credentials"); + // //@ts-ignore + // const credential = new Credential.default.default({ + // + // type: "access_key", + // }); + const config = new $OpenApi.Config({ accessKeyId: this.access.accessKeyId, accessKeySecret: this.access.accessKeySecret, - type: "access_key", - }); - const config = new $OpenApi.Config({ - credential, }); // Endpoint 请参考 https://api.aliyun.com/product/FC // config.endpoint = `esa.${this.regionId}.aliyuncs.com`; @@ -76,10 +75,7 @@ export class AliyunClientV2 { }); const runtime = new $Util.RuntimeOptions({}); - const request = new $OpenApi.OpenApiRequest({ - body: req.data, - query: req.query, - }); + const request = new $OpenApi.OpenApiRequest(req.data); // 复制代码运行请自行打印 API 的返回值 // 返回值实际为 Map 类型,可从 Map 中获得三类数据:响应体 body、响应头 headers、HTTP 返回的状态码 statusCode。 const res = await client.callApi(params, request, runtime); 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 44793eaf..6b26a998 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 @@ -132,10 +132,12 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin { // 接口版本 version: "2024-09-10", data: { - SiteId: siteId, - CasId: certId, - Type: "cas", - Name: certName + body:{ + SiteId: siteId, + CasId: certId, + Type: "cas", + Name: certName + } } }); this.logger.info(`部署站点[${siteId}]证书成功:${JSON.stringify(res)}`); @@ -197,8 +199,10 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin { action: "ListCertificates", version: "2024-09-10", method: "GET", - query: { - SiteId: siteId + data:{ + query: { + SiteId: siteId + } } }); @@ -212,10 +216,12 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin { version: "2024-09-10", // 接口 HTTP 方法 method: "GET", - query: { - SiteId: siteId, - Id: item.id - } + data:{ + query: { + SiteId: siteId, + Id: item.id + } + } }); this.logger.info(`证书${item.Name}已删除`); }