diff --git a/README.md b/README.md index 881ad4e9d..93caa2453 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ https://certd.handfree.work/ > [50元专业版优惠券限时领取](https://app.handfree.work/subject/#/app/certd/product) https://app.handfree.work/subject/#/app/certd/product -> handfree.work是Certd官方激活码购买平台 +> app.handfree.work是Certd官方激活码购买平台 专业版、商业版特权对比 diff --git a/docs/guide/index.md b/docs/guide/index.md index b1820e6f2..3c5a18fea 100644 --- a/docs/guide/index.md +++ b/docs/guide/index.md @@ -6,7 +6,7 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工 关键字:证书自动申请、证书自动更新、证书自动续期、证书自动续签、证书管理工具 -| 官方开源地址: | | +|  |官方开源地址: | | ---- | ---- | | [Github](https://github.com/certd/certd)| ![](https://img.shields.io/github/stars/certd/certd?logo=github) | | [Gitee](https://gitee.com/certd/certd) | ![](https://gitee.com/certd/certd/badge/star.svg?theme=dark) | diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts index 817ac5f61..36ed9173a 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts @@ -227,7 +227,11 @@ export class DeployCertToAliyunApig extends AbstractTaskPlugin { domain: item.name, }; }); - return optionsUtils.buildGroupOptions(options, this.certDomains); + const records = optionsUtils.buildGroupOptions(options, this.certDomains); + return { + list: records, + total: res?.data?.totalSize || 0, + } } async onGetRegionList(data: any) { diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts index b42d1c11e..521b8fb66 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts @@ -1,4 +1,4 @@ -import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { AbstractTaskPlugin, IsTaskPlugin, Pager, PageSearch, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; import { optionsUtils } from "@certd/basic"; @@ -70,6 +70,8 @@ export class DeployCertToAliyunApiGateway extends AbstractTaskPlugin { watches: ["regionEndpoint", "accessId"], required: true, single: true, + pager: true, + search: true, }) ) groupId!: string; @@ -122,7 +124,7 @@ export class DeployCertToAliyunApiGateway extends AbstractTaskPlugin { this.logger.info(`设置${domainName}证书成功:`, ret.RequestId); } - async onGetGroupList(data: any) { + async onGetGroupList(data: PageSearch) { if (!this.accessId) { throw new Error("请选择Access授权"); } @@ -131,23 +133,36 @@ export class DeployCertToAliyunApiGateway extends AbstractTaskPlugin { } const access = await this.getAccess(this.accessId); const client = access.getClient(this.regionEndpoint); + + const pager = new Pager(data) const res = await client.doRequest({ // 接口名称 action: "DescribeApiGroups", // 接口版本 version: "2016-07-14", - data: {}, + data: { + query: { + GroupName: data.searchKey, + PageNumber: pager.pageNo, + PageSize: pager.pageSize, + }, + }, }); const list = res?.ApiGroupAttributes?.ApiGroupAttribute; if (!list || list.length === 0) { throw new Error("没有数据,您可以手动输入API网关ID"); } - return list.map((item: any) => { + const records = list.map((item: any) => { return { value: item.GroupId, label: `${item.GroupName}<${item.GroupId}>`, }; }); + + return { + list: records, + total: res?.TotalCount || 0, + } } async onGetDomainList(data: any) {