diff --git a/packages/plugins/plugin-lib/src/ctyun/access/ctyun-access.ts b/packages/plugins/plugin-lib/src/ctyun/access/ctyun-access.ts index aa7ec53c..04875b89 100644 --- a/packages/plugins/plugin-lib/src/ctyun/access/ctyun-access.ts +++ b/packages/plugins/plugin-lib/src/ctyun/access/ctyun-access.ts @@ -5,6 +5,7 @@ import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline"; title: "天翼云授权", desc: "", icon: "ant-design:aliyun-outlined", + order: 2, }) export class CtyunAccess extends BaseAccess { @AccessInput({ diff --git a/packages/plugins/plugin-lib/src/qiniu/access.ts b/packages/plugins/plugin-lib/src/qiniu/access.ts index d760abbf..7a4e757f 100644 --- a/packages/plugins/plugin-lib/src/qiniu/access.ts +++ b/packages/plugins/plugin-lib/src/qiniu/access.ts @@ -6,6 +6,7 @@ import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline"; desc: "", icon: "svg:icon-qiniuyun", input: {}, + order: 2, }) export class QiniuAccess extends BaseAccess { @AccessInput({ diff --git a/packages/plugins/plugin-lib/src/ssh/ssh-access.ts b/packages/plugins/plugin-lib/src/ssh/ssh-access.ts index 22f6956f..984a435c 100644 --- a/packages/plugins/plugin-lib/src/ssh/ssh-access.ts +++ b/packages/plugins/plugin-lib/src/ssh/ssh-access.ts @@ -5,6 +5,7 @@ import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline"; desc: "", icon: "clarity:host-line", input: {}, + order: 0, }) export class SshAccess extends BaseAccess { @AccessInput({ diff --git a/packages/plugins/plugin-lib/src/tencent/access.ts b/packages/plugins/plugin-lib/src/tencent/access.ts index e95f4262..aaa1c150 100644 --- a/packages/plugins/plugin-lib/src/tencent/access.ts +++ b/packages/plugins/plugin-lib/src/tencent/access.ts @@ -4,6 +4,7 @@ import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline"; name: "tencent", title: "腾讯云", icon: "svg:icon-tencentcloud", + order: 0, }) export class TencentAccess extends BaseAccess { @AccessInput({ @@ -59,4 +60,8 @@ export class TencentAccess extends BaseAccess { isIntl() { return this.accountType === "intl"; } + + intlDomain() { + return this.isIntl() ? "intl." : ""; + } } diff --git a/packages/plugins/plugin-lib/src/tencent/lib/ssl-client.ts b/packages/plugins/plugin-lib/src/tencent/lib/ssl-client.ts index 2fef42b9..4846ee1a 100644 --- a/packages/plugins/plugin-lib/src/tencent/lib/ssl-client.ts +++ b/packages/plugins/plugin-lib/src/tencent/lib/ssl-client.ts @@ -26,7 +26,7 @@ export class TencentSslClient { region: this.region, profile: { httpProfile: { - endpoint: "ssl.tencentcloudapi.com", + endpoint: this.access.isIntl() ? "ssl.intl.tencentcloudapi.com" : "ssl.tencentcloudapi.com", }, }, }; diff --git a/packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.ts index fb1ccd96..de14f46b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-demo/dns-provider.ts @@ -16,6 +16,7 @@ type DemoRecord = { icon: 'clarity:plugin-line', // 这里是对应的云平台的access类型名称 accessType: 'demo', + order:99, }) export class DemoDnsProvider extends AbstractDnsProvider { access!: DemoAccess; diff --git a/packages/ui/certd-server/src/plugins/plugin-huawei/access/huawei-access.ts b/packages/ui/certd-server/src/plugins/plugin-huawei/access/huawei-access.ts index 13683a56..eeaaa5c6 100644 --- a/packages/ui/certd-server/src/plugins/plugin-huawei/access/huawei-access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-huawei/access/huawei-access.ts @@ -5,6 +5,7 @@ import { IsAccess, AccessInput, BaseAccess } from '@certd/pipeline'; title: '华为云授权', desc: '', icon: 'svg:icon-huawei', + order: 0, }) export class HuaweiAccess extends BaseAccess { @AccessInput({ diff --git a/packages/ui/certd-server/src/plugins/plugin-jdcloud/access.ts b/packages/ui/certd-server/src/plugins/plugin-jdcloud/access.ts index ab823108..ecba2bce 100644 --- a/packages/ui/certd-server/src/plugins/plugin-jdcloud/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-jdcloud/access.ts @@ -9,6 +9,7 @@ import {AccessInput, BaseAccess, IsAccess} from '@certd/pipeline'; title: '京东云', desc: '', icon: 'svg:icon-jdcloud', + order: 1, }) export class JDCloudAccess extends BaseAccess { diff --git a/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts index f4fd7d3d..597cdbad 100644 --- a/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-jdcloud/dns-provider.ts @@ -6,7 +6,8 @@ import { JDCloudAccess } from "./access.js"; title: "京东云", desc: "京东云DNS解析提供商", accessType: "jdcloud", - icon: "svg:icon-jdcloud" + icon: "svg:icon-jdcloud", + order:3, }) export class JDCloudDnsProvider extends AbstractDnsProvider { access!: JDCloudAccess; diff --git a/packages/ui/certd-server/src/plugins/plugin-rainyun/access.ts b/packages/ui/certd-server/src/plugins/plugin-rainyun/access.ts index b02c7d01..a9d08017 100644 --- a/packages/ui/certd-server/src/plugins/plugin-rainyun/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-rainyun/access.ts @@ -9,7 +9,8 @@ import { CertInfo } from "@certd/plugin-cert"; name: "rainyun", title: "雨云授权", desc: "https://app.rainyun.com/", - icon: "svg:icon-lucky" + icon: "svg:icon-lucky", + order: 100 }) export class RainyunAccess extends BaseAccess { diff --git a/packages/ui/certd-server/src/plugins/plugin-rainyun/dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-rainyun/dns-provider.ts index c37800ef..1ed0c69c 100644 --- a/packages/ui/certd-server/src/plugins/plugin-rainyun/dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-rainyun/dns-provider.ts @@ -7,7 +7,6 @@ import { RainyunAccess } from "./access.js"; desc: "雨云DNS解析提供商", accessType: "rainyun", icon: "svg:icon-lucky", - order: 0 }) export class RainyunDnsProvider extends AbstractDnsProvider { diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-all/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-all/index.ts index ce6adc47..4ef96c2f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-all/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-all/index.ts @@ -122,7 +122,7 @@ export class DeployCertToTencentAll extends AbstractTaskPlugin { region: this.region, profile: { httpProfile: { - endpoint: 'ssl.tencentcloudapi.com', + endpoint: `ssl.${access.intlDomain()}tencentcloudapi.com`, }, }, }); diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts index 8328ff0e..ab96b5ca 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts @@ -104,7 +104,7 @@ export class TencentDeployCertToCDNv2 extends AbstractTaskPlugin { region: '', profile: { httpProfile: { - endpoint: 'cdn.tencentcloudapi.com', + endpoint: `cdn.${accessProvider.intlDomain()}tencentcloudapi.com`, }, }, }; diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts index eb68b3c6..6a5b156b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts @@ -80,7 +80,7 @@ export class DeployToCdnPlugin extends AbstractTaskPlugin { region: '', profile: { httpProfile: { - endpoint: 'cdn.tencentcloudapi.com', + endpoint: `cdn.${accessProvider.intlDomain()}tencentcloudapi.com`, }, }, }; diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts index 1abb57d3..b53acf4e 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts @@ -119,7 +119,7 @@ export class DeployCertToTencentCLB extends AbstractTaskPlugin { region: region, profile: { httpProfile: { - endpoint: 'clb.tencentcloudapi.com', + endpoint: `clb.${accessProvider.intlDomain()}tencentcloudapi.com`, }, }, }; diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-eo/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-eo/index.ts index df3c1074..04302d19 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-eo/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-eo/index.ts @@ -89,7 +89,8 @@ export class DeployCertToTencentEO extends AbstractTaskPlugin { getClient(accessProvider: TencentAccess) { const TeoClient = this.Client; - const endpoint = accessProvider.isIntl()?"teo.intl.tencentcloudapi.com": "teo.tencentcloudapi.com"; + //teo.intl.tencentcloudapi.com + const endpoint = `teo.${accessProvider.intlDomain()}tencentcloudapi.com`; const clientConfig = { credential: { secretId: accessProvider.secretId, diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts index 92b0f626..0bd4a63c 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-live/index.ts @@ -101,7 +101,7 @@ export class TencentDeployCertToLive extends AbstractTaskPlugin { region: '', profile: { httpProfile: { - endpoint: 'live.tencentcloudapi.com', + endpoint: `live.${accessProvider.intlDomain()}tencentcloudapi.com`, }, }, }; diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts index 6578a745..05ad7e93 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts @@ -210,7 +210,7 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin { region, profile: { httpProfile: { - endpoint: "tke.tencentcloudapi.com" + endpoint: `tke.${accessProvider.intlDomain()}tencentcloudapi.com` } } }; diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/start-instances/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/start-instances/index.ts index e4de138e..5487a216 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/start-instances/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/start-instances/index.ts @@ -151,7 +151,7 @@ export class TencentActionInstancesPlugin extends AbstractTaskPlugin { region: this.region, profile: { httpProfile: { - endpoint: 'cvm.tencentcloudapi.com', + endpoint: `cvm.${accessProvider.intlDomain()}tencentcloudapi.com`, }, }, }; diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/access.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/access.ts index e89b4ec9..2a859835 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/access.ts @@ -9,6 +9,7 @@ import {AccessInput, BaseAccess, IsAccess} from '@certd/pipeline'; title: '火山引擎', desc: '', icon: 'svg:icon-volcengine', + order: 1, }) export class VolcengineAccess extends BaseAccess { diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/volcengine-dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/volcengine-dns-provider.ts index eb10ec6f..f3ef15b7 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/volcengine-dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/volcengine-dns-provider.ts @@ -8,7 +8,8 @@ import { VolcengineAccess } from "./access.js"; title: "火山引擎", desc: "火山引擎DNS解析提供商", accessType: "volcengine", - icon: "svg:icon-volcengine" + icon: "svg:icon-volcengine", + order:2, }) export class VolcengineDnsProvider extends AbstractDnsProvider { client: VolcengineDnsClient;