DNSPod改名为腾讯云DNSPod/DNSPod 支持腾讯云API密钥

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).

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).

web/views/@default/dns/providers/createPopup.html

@@ -27,24 +27,47 @@
 
 		<!-- DNSPod -->
 		<tbody v-if="type == 'dnspod'">
-			<tr>
+            <tr>
+                <td>密钥类型 *</td>
+                <td>
+                    <select class="ui dropdown auto-width" name="paramDNSPodAPIType" v-model="paramDNSPodAPIType">
+                        <option value="tencentDNS">腾讯云API密钥</option>
+                        <option value="dnsPodToken">DNSPod Token</option>
+                    </select>
+                </td>
+            </tr>
+            <tr v-show="paramDNSPodAPIType == 'tencentDNS'">
+                <td>SecretId *</td>
+                <td>
+                    <input type="text" name="paramDNSPodAccessKeyId" maxlength="100"/>
+                    <p class="comment">在DNSPod控制台“账号中心--API密钥”中获取。</p>
+                </td>
+            </tr>
+            <tr v-show="paramDNSPodAPIType == 'tencentDNS'">
+                <td>SecretKey *</td>
+                <td>
+                    <input type="text" name="paramDNSPodAccessKeySecret" maxlength="100"/>
+                    <p class="comment">在DNSPod控制台“账号中心--API密钥”中获取。</p>
+                </td>
+            </tr>
+			<tr v-show="paramDNSPodAPIType == 'dnsPodToken'">
 				<td>密钥ID *</td>
 				<td>
-					<input type="text" name="paramId" maxlength="100" spellcheck="false"/>
-					<p class="comment">获取方法参考：<a href="https://docs.dnspod.cn/account/5f2d466de8320f1a740d9ff3/" target="_blank">文档</a> </p>
+					<input type="text" name="paramDNSPodId" maxlength="100" spellcheck="false"/>
+                    <p class="comment">在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。</p>
 				</td>
 			</tr>
-			<tr>
+			<tr v-show="paramDNSPodAPIType == 'dnsPodToken'">
 				<td>密钥Token *</td>
 				<td>
-					<input type="text" name="paramToken" maxlength="100" spellcheck="false"/>
-					<p class="comment">获取方法参考：<a href="https://docs.dnspod.cn/account/5f2d466de8320f1a740d9ff3/" target="_blank">文档</a> </p>
+					<input type="text" name="paramDNSPodToken" maxlength="100" spellcheck="false"/>
+                    <p class="comment">在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。</p>
 				</td>
 			</tr>
-            <tr>
+            <tr v-if="paramDNSPodAPIType == 'dnsPodToken'">
                 <td>区域</td>
                 <td>
-                    <select class="ui dropdown auto-width" name="paramRegion">
+                    <select class="ui dropdown auto-width" name="paramDNSPodRegion">
                         <option value="">中国站</option>
                         <option value="international">国际站</option>
                     </select>

web/views/@default/dns/providers/createPopup.js

@@ -14,4 +14,7 @@ Tea.context(function () {
 			this.typeDescription = ""
 		}
 	}
+
+	// DNSPod
+	this.paramDNSPodAPIType = "tencentDNS"
 })

web/views/@default/dns/providers/provider.html

@@ -21,15 +21,30 @@
 
 	<!-- DNSPod -->
 	<tbody v-if="provider.type == 'dnspod'">
-		<tr>
+        <tr>
+            <td class="color-border">密钥类型</td>
+            <td>
+                <span v-if="provider.apiParams.apiType == 'tencentDNS'">腾讯云API密钥</span>
+                <span v-else>DNSPod Token</span>
+            </td>
+        </tr>
+        <tr v-if="provider.apiParams.apiType == 'tencentDNS'">
+            <td class="color-border">SecretId</td>
+            <td>{{provider.apiParams.accessKeyId}}</td>
+        </tr>
+        <tr v-if="provider.apiParams.apiType == 'tencentDNS'">
+            <td class="color-border">SecretKey</td>
+            <td>{{provider.apiParams.accessKeySecret}}</td>
+        </tr>
+        <tr v-if="provider.apiParams.apiType != 'tencentDNS'">
 			<td class="color-border">密钥ID</td>
 			<td>{{provider.apiParams.id}}</td>
 		</tr>
-		<tr>
+		<tr v-if="provider.apiParams.apiType != 'tencentDNS'">
 			<td class="color-border">密钥Token</td>
 			<td>{{provider.apiParams.token}}</td>
 		</tr>
-        <tr>
+        <tr v-if="provider.apiParams.apiType != 'tencentDNS'">
             <td class="color-border">区域</td>
             <td>
                 <span v-if="provider.apiParams.region == 'international'">国际站</span>

web/views/@default/dns/providers/updatePopup.html

@@ -26,24 +26,47 @@
 
 		<!-- DNSPod -->
 		<tbody v-if="provider.type == 'dnspod'">
-			<tr>
+            <tr>
+                <td>密钥类型 *</td>
+                <td>
+                    <select class="ui dropdown auto-width" name="paramDNSPodAPIType" v-model="provider.params.apiType">
+                        <option value="tencentDNS">腾讯云API密钥</option>
+                        <option value="dnsPodToken">DNSPod Token</option>
+                    </select>
+                </td>
+            </tr>
+            <tr v-show="provider.params.apiType == 'tencentDNS'">
+                <td>SecretId *</td>
+                <td>
+                    <input type="text" name="paramDNSPodAccessKeyId" maxlength="100" v-model="provider.params.accessKeyId"/>
+                    <p class="comment">在DNSPod控制台“账号中心--API密钥”中获取。</p>
+                </td>
+            </tr>
+            <tr v-show="provider.params.apiType == 'tencentDNS'">
+                <td>SecretKey *</td>
+                <td>
+                    <input type="text" name="paramDNSPodAccessKeySecret" maxlength="100" v-model="provider.params.accessKeySecret"/>
+                    <p class="comment">在DNSPod控制台“账号中心--API密钥”中获取。</p>
+                </td>
+            </tr>
+			<tr v-show="provider.params.apiType == null || provider.params.apiType.length == 0 || provider.params.apiType == 'dnsPodToken'">
 				<td>密钥ID *</td>
 				<td>
-					<input type="text" name="paramId" maxlength="100" v-model="provider.params.id"/>
-					<p class="comment">获取方法参考：<a href="https://docs.dnspod.cn/account/5f2d466de8320f1a740d9ff3/" target="_blank">文档</a> </p>
+					<input type="text" name="paramDNSPodId" maxlength="100" v-model="provider.params.id"/>
+					<p class="comment">在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。</p>
 				</td>
 			</tr>
-			<tr>
+			<tr v-show="provider.params.apiType == null || provider.params.apiType.length == 0 || provider.params.apiType == 'dnsPodToken'">
 				<td>密钥Token *</td>
 				<td>
-					<input type="text" name="paramToken" maxlength="100" v-model="provider.params.token" spellcheck="false"/>
-					<p class="comment">获取方法参考：<a href="https://docs.dnspod.cn/account/5f2d466de8320f1a740d9ff3/" target="_blank">文档</a> </p>
+					<input type="text" name="paramDNSPodToken" maxlength="100" v-model="provider.params.token" spellcheck="false"/>
+                    <p class="comment">在DNSPod控制台“账号中心--API密钥--DNSPod Token”中获取。</p>
 				</td>
 			</tr>
-            <tr>
+            <tr v-if="provider.params.apiType == null || provider.params.apiType.length == 0 || provider.params.apiType == 'dnsPodToken'">
                 <td>区域</td>
                 <td>
-                    <select class="ui dropdown auto-width" name="paramRegion" v-model="provider.params.region">
+                    <select class="ui dropdown auto-width" name="paramDNSPodRegion" v-model="provider.params.region">
                         <option value="">中国站</option>
                         <option value="international">国际站</option>
                     </select>

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"
+	}
 })