diff --git a/internal/web/actions/default/dns/providers/createPopup.go b/internal/web/actions/default/dns/providers/createPopup.go index 3c50a197..8ad4cfd5 100644 --- a/internal/web/actions/default/dns/providers/createPopup.go +++ b/internal/web/actions/default/dns/providers/createPopup.go @@ -52,9 +52,13 @@ func (this *CreatePopupAction) RunPost(params struct { Type string // DNSPod - ParamId string - ParamToken string - ParamRegion string + ParamDNSPodId string + ParamDNSPodToken string + ParamDNSPodRegion string + + ParamDNSPodAPIType string + ParamDNSPodAccessKeyId string + ParamDNSPodAccessKeySecret string // AliDNS ParamAliDNSAccessKeyId string @@ -89,18 +93,31 @@ func (this *CreatePopupAction) RunPost(params struct { Field("type", params.Type). Require("请选择服务商厂家") - apiParams := maps.Map{} + var apiParams = maps.Map{} switch params.Type { case "dnspod": - params.Must. - Field("paramId", params.ParamId). - Require("请输入密钥ID"). - Field("paramToken", params.ParamToken). - Require("请输入密钥Token") + apiParams["apiType"] = params.ParamDNSPodAPIType + switch params.ParamDNSPodAPIType { + case "tencentDNS": + params.Must. + Field("paramDNSPodAccessKeyId", params.ParamDNSPodAccessKeyId). + Require("请输入SecretId"). + Field("paramDNSPodAccessKeySecret", params.ParamDNSPodAccessKeySecret). + Require("请输入SecretKey") + apiParams["accessKeyId"] = params.ParamDNSPodAccessKeyId + apiParams["accessKeySecret"] = params.ParamDNSPodAccessKeySecret + apiParams["region"] = params.ParamDNSPodRegion + default: + params.Must. + Field("paramId", params.ParamDNSPodId). + Require("请输入密钥ID"). + Field("paramToken", params.ParamDNSPodToken). + Require("请输入密钥Token") - apiParams["id"] = params.ParamId - apiParams["token"] = params.ParamToken - apiParams["region"] = params.ParamRegion + apiParams["id"] = params.ParamDNSPodId + apiParams["token"] = params.ParamDNSPodToken + apiParams["region"] = params.ParamDNSPodRegion + } case "alidns": params.Must. Field("paramAliDNSAccessKeyId", params.ParamAliDNSAccessKeyId). diff --git a/internal/web/actions/default/dns/providers/updatePopup.go b/internal/web/actions/default/dns/providers/updatePopup.go index b78170b4..bed83785 100644 --- a/internal/web/actions/default/dns/providers/updatePopup.go +++ b/internal/web/actions/default/dns/providers/updatePopup.go @@ -79,9 +79,13 @@ func (this *UpdatePopupAction) RunPost(params struct { Type string // DNSPod - ParamId string - ParamToken string - ParamRegion string + ParamDNSPodId string + ParamDNSPodToken string + ParamDNSPodRegion string + + ParamDNSPodAPIType string + ParamDNSPodAccessKeyId string + ParamDNSPodAccessKeySecret string // AliDNS ParamAliDNSAccessKeyId string @@ -118,18 +122,31 @@ func (this *UpdatePopupAction) RunPost(params struct { Field("type", params.Type). Require("请选择服务商厂家") - apiParams := maps.Map{} + var apiParams = maps.Map{} switch params.Type { case "dnspod": - params.Must. - Field("paramId", params.ParamId). - Require("请输入密钥ID"). - Field("paramToken", params.ParamToken). - Require("请输入密钥Token") + apiParams["apiType"] = params.ParamDNSPodAPIType + switch params.ParamDNSPodAPIType { + case "tencentDNS": + params.Must. + Field("paramDNSPodAccessKeyId", params.ParamDNSPodAccessKeyId). + Require("请输入SecretId"). + Field("paramDNSPodAccessKeySecret", params.ParamDNSPodAccessKeySecret). + Require("请输入SecretKey") + apiParams["accessKeyId"] = params.ParamDNSPodAccessKeyId + apiParams["accessKeySecret"] = params.ParamDNSPodAccessKeySecret + apiParams["region"] = params.ParamDNSPodRegion + default: + params.Must. + Field("paramId", params.ParamDNSPodId). + Require("请输入密钥ID"). + Field("paramToken", params.ParamDNSPodToken). + Require("请输入密钥Token") - apiParams["id"] = params.ParamId - apiParams["token"] = params.ParamToken - apiParams["region"] = params.ParamRegion + apiParams["id"] = params.ParamDNSPodId + apiParams["token"] = params.ParamDNSPodToken + apiParams["region"] = params.ParamDNSPodRegion + } case "alidns": params.Must. Field("paramAliDNSAccessKeyId", params.ParamAliDNSAccessKeyId). diff --git a/web/views/@default/dns/providers/createPopup.html b/web/views/@default/dns/providers/createPopup.html index e9781ab9..ecfcb8b3 100644 --- a/web/views/@default/dns/providers/createPopup.html +++ b/web/views/@default/dns/providers/createPopup.html @@ -27,24 +27,47 @@ - + + 密钥类型 * + + + + + + SecretId * + + +

在DNSPod控制台“账号中心--API密钥”中获取。

+ + + + SecretKey * + + +

在DNSPod控制台“账号中心--API密钥”中获取。

+ + + 密钥ID * - -

获取方法参考:文档

+ +

在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。

- + 密钥Token * - -

获取方法参考:文档

+ +

在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。

- + 区域 - diff --git a/web/views/@default/dns/providers/createPopup.js b/web/views/@default/dns/providers/createPopup.js index e86900e5..9ac08b10 100644 --- a/web/views/@default/dns/providers/createPopup.js +++ b/web/views/@default/dns/providers/createPopup.js @@ -14,4 +14,7 @@ Tea.context(function () { this.typeDescription = "" } } + + // DNSPod + this.paramDNSPodAPIType = "tencentDNS" }) \ No newline at end of file diff --git a/web/views/@default/dns/providers/provider.html b/web/views/@default/dns/providers/provider.html index 577c41ca..e8659606 100644 --- a/web/views/@default/dns/providers/provider.html +++ b/web/views/@default/dns/providers/provider.html @@ -21,15 +21,30 @@ - + + 密钥类型 + + 腾讯云API密钥 + DNSPod Token + + + + SecretId + {{provider.apiParams.accessKeyId}} + + + SecretKey + {{provider.apiParams.accessKeySecret}} + + 密钥ID {{provider.apiParams.id}} - + 密钥Token {{provider.apiParams.token}} - + 区域 国际站 diff --git a/web/views/@default/dns/providers/updatePopup.html b/web/views/@default/dns/providers/updatePopup.html index b07f1ea0..fd16dc98 100644 --- a/web/views/@default/dns/providers/updatePopup.html +++ b/web/views/@default/dns/providers/updatePopup.html @@ -26,24 +26,47 @@ - + + 密钥类型 * + + + + + + SecretId * + + +

在DNSPod控制台“账号中心--API密钥”中获取。

+ + + + SecretKey * + + +

在DNSPod控制台“账号中心--API密钥”中获取。

+ + + 密钥ID * - -

获取方法参考:文档

+ +

在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。

- + 密钥Token * - -

获取方法参考:文档

+ +

在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。

- + 区域 - diff --git a/web/views/@default/dns/providers/updatePopup.js b/web/views/@default/dns/providers/updatePopup.js index 27718731..8c09b7af 100644 --- a/web/views/@default/dns/providers/updatePopup.js +++ b/web/views/@default/dns/providers/updatePopup.js @@ -7,4 +7,9 @@ Tea.context(function () { that.typeDescription = v.description } }) + + // DNSPod + if (this.provider.type == "dnspod" && this.provider.params != null && (this.provider.params.apiType == null || this.provider.params.apiType.length == 0)) { + this.provider.params.apiType = "dnsPodToken" + } }) \ No newline at end of file