阿里云DNS增加区域ID

internal/web/actions/default/dns/providers/createPopup.go

@@ -70,8 +70,9 @@ func (this *CreatePopupAction) RunPost(params struct {
 	ParamRegion string
 
 	// AliDNS
-	ParamAccessKeyId     string
+	ParamAliDNSAccessKeyId     string
-	ParamAccessKeySecret string
+	ParamAliDNSAccessKeySecret string
+	ParamAliDNSRegionId        string
 
 	// HuaweiDNS
 	ParamHuaweiAccessKeyId     string
@@ -115,13 +116,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 		apiParams["region"] = params.ParamRegion
 	case "alidns":
 		params.Must.
-			Field("paramAccessKeyId", params.ParamAccessKeyId).
+			Field("paramAliDNSAccessKeyId", params.ParamAliDNSAccessKeyId).
 			Require("请输入AccessKeyId").
-			Field("paramAccessKeySecret", params.ParamAccessKeySecret).
+			Field("paramAliDNSAccessKeySecret", params.ParamAliDNSAccessKeySecret).
 			Require("请输入AccessKeySecret")
 
-		apiParams["accessKeyId"] = params.ParamAccessKeyId
+		apiParams["accessKeyId"] = params.ParamAliDNSAccessKeyId
-		apiParams["accessKeySecret"] = params.ParamAccessKeySecret
+		apiParams["accessKeySecret"] = params.ParamAliDNSAccessKeySecret
+		apiParams["regionId"] = params.ParamAliDNSRegionId
 	case "huaweiDNS":
 		params.Must.
 			Field("paramHuaweiAccessKeyId", params.ParamHuaweiAccessKeyId).

internal/web/actions/default/dns/providers/updatePopup.go

@@ -97,8 +97,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	ParamRegion string
 
 	// AliDNS
-	ParamAccessKeyId     string
+	ParamAliDNSAccessKeyId     string
-	ParamAccessKeySecret string
+	ParamAliDNSAccessKeySecret string
+	ParamAliDNSRegionId        string
 
 	// HuaweiDNS
 	ParamHuaweiAccessKeyId     string
@@ -144,13 +145,14 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		apiParams["region"] = params.ParamRegion
 	case "alidns":
 		params.Must.
-			Field("paramAccessKeyId", params.ParamAccessKeyId).
+			Field("paramAliDNSAccessKeyId", params.ParamAliDNSAccessKeyId).
 			Require("请输入AccessKeyId").
-			Field("paramAccessKeySecret", params.ParamAccessKeySecret).
+			Field("paramAliDNSAccessKeySecret", params.ParamAliDNSAccessKeySecret).
 			Require("请输入AccessKeySecret")
 
-		apiParams["accessKeyId"] = params.ParamAccessKeyId
+		apiParams["accessKeyId"] = params.ParamAliDNSAccessKeyId
-		apiParams["accessKeySecret"] = params.ParamAccessKeySecret
+		apiParams["accessKeySecret"] = params.ParamAliDNSAccessKeySecret
+		apiParams["regionId"] = params.ParamAliDNSRegionId
 	case "huaweiDNS":
 		params.Must.
 			Field("paramHuaweiAccessKeyId", params.ParamHuaweiAccessKeyId).

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

@@ -57,17 +57,24 @@
 			<tr>
 				<td>AccessKeyId *</td>
 				<td>
-					<input type="text" name="paramAccessKeyId" maxlength="100"/>
+					<input type="text" name="paramAliDNSAccessKeyId" maxlength="100"/>
 					<p class="comment">登录阿里云控制台 -- 在"访问控制"中创建和获取。</p>
 				</td>
 			</tr>
 			<tr>
 				<td>AccessKeySecret *</td>
 				<td>
-					<input type="text" name="paramAccessKeySecret" maxlength="100"/>
+					<input type="text" name="paramAliDNSAccessKeySecret" maxlength="100"/>
 					<p class="comment">登录阿里云控制台 -- 在"访问控制"中创建和获取。</p>
 				</td>
 			</tr>
+            <tr>
+                <td>区域ID<optional-label></optional-label></td>
+                <td>
+                    <input type="text" name="paramAliDNSRegionId" maxlength="100"/>
+                    <p class="comment">阿里云产品所在区域代号，通常不需要填写。</p>
+                </td>
+            </tr>
 		</tbody>
 
         <!-- 华为云 -->

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

@@ -16,7 +16,7 @@
         </div>
         <div class="ui field" v-if="providerTypes.length > 0">
             <select class="ui dropdown auto-width" name="providerType" v-model="providerType">
-                <option value="">[DNS厂家]</option>
+                <option value="">[服务商厂家]</option>
                 <option v-for="p in providerTypes" :value="p.code">{{p.name}}({{p.count}})</option>
             </select>
         </div>

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

@@ -48,6 +48,13 @@
 			<td>AccessKeySecret</td>
 			<td>{{provider.apiParams.accessKeySecret}}</td>
 		</tr>
+        <tr>
+            <td>区域ID</td>
+            <td>
+                <span v-if="provider.apiParams.regionId != null && provider.apiParams.regionId.length > 0">{{provider.apiParams.regionId}}</span>
+                <span v-else class="disabled">没有设置。</span>
+            </td>
+        </tr>
 	</tbody>
 
     <!-- HuaweiDNS -->

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

@@ -56,17 +56,24 @@
 			<tr>
 				<td>AccessKeyId *</td>
 				<td>
-					<input type="text" name="paramAccessKeyId" maxlength="100" v-model="provider.params.accessKeyId"/>
+					<input type="text" name="paramAliDNSAccessKeyId" maxlength="100" v-model="provider.params.accessKeyId"/>
 					<p class="comment">登录阿里云控制台 -- 在"访问控制"中创建和获取。</p>
 				</td>
 			</tr>
 			<tr>
 				<td>AccessKeySecret *</td>
 				<td>
-					<input type="text" name="paramAccessKeySecret" maxlength="100" v-model="provider.params.accessKeySecret"/>
+					<input type="text" name="paramAliDNSAccessKeySecret" maxlength="100" v-model="provider.params.accessKeySecret"/>
 					<p class="comment">登录阿里云控制台 -- 在"访问控制"中创建和获取。</p>
 				</td>
 			</tr>
+            <tr>
+                <td>区域ID<optional-label></optional-label></td>
+                <td>
+                    <input type="text" name="paramAliDNSRegionId" maxlength="100" v-model="provider.params.regionId"/>
+                    <p class="comment">阿里云产品所在区域代号，通常不需要填写。</p>
+                </td>
+            </tr>
 		</tbody>
 
         <!-- 华为云 -->