Skip to content

Commit aa7b5c1

Browse files
committed
DNS服务商账号增加“最小TTL”选项
1 parent d6fdd9c commit aa7b5c1

File tree

6 files changed

+62
-13
lines changed

6 files changed

+62
-13
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ func (this *CreatePopupAction) RunPost(params struct {
8484
ParamEdgeDNSAPIAccessKeyId string
8585
ParamEdgeDNSAPIAccessKeySecret string
8686

87+
MinTTL int32
88+
8789
Must *actions.Must
8890
CSRF *actionutils.CSRF
8991
}) {
@@ -177,6 +179,7 @@ func (this *CreatePopupAction) RunPost(params struct {
177179
Name: params.Name,
178180
Type: params.Type,
179181
ApiParamsJSON: apiParams.AsJSON(),
182+
MinTTL: params.MinTTL,
180183
})
181184
if err != nil {
182185
this.ErrorPage(err)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ func (this *ProviderAction) RunGet(params struct {
5959
"name": provider.Name,
6060
"type": provider.Type,
6161
"typeName": provider.TypeName,
62+
"minTTL": provider.MinTTL,
6263
"apiParams": apiParams,
6364
"localEdgeDNS": localEdgeDNSMap,
6465
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
5050
"name": provider.Name,
5151
"type": provider.Type,
5252
"typeName": provider.TypeName,
53+
"minTTL": provider.MinTTL,
5354
"params": apiParams,
5455
}
5556

@@ -114,6 +115,8 @@ func (this *UpdatePopupAction) RunPost(params struct {
114115
ParamEdgeDNSAPIAccessKeyId string
115116
ParamEdgeDNSAPIAccessKeySecret string
116117

118+
MinTTL int32
119+
117120
Must *actions.Must
118121
CSRF *actionutils.CSRF
119122
}) {
@@ -208,6 +211,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
208211
_, err := this.RPC().DNSProviderRPC().UpdateDNSProvider(this.AdminContext(), &pb.UpdateDNSProviderRequest{
209212
DnsProviderId: params.ProviderId,
210213
Name: params.Name,
214+
MinTTL: params.MinTTL,
211215
ApiParamsJSON: apiParams.AsJSON(),
212216
})
213217
if err != nil {

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h3>添加DNS服务商账号</h3>
2121
<p class="comment" v-if="typeDescription.length > 0">{{typeDescription}} 系统会保留原有域名下的域名解析,请放心使用。<span v-if="!teaIsPlus">购买商业版可获得更多厂商支持。</span></p>
2222
</td>
2323
</tr>
24-
<tr>
24+
<tr v-show="type.length > 0">
2525
<td colspan="2">API参数</td>
2626
</tr>
2727

@@ -374,6 +374,24 @@ <h3>添加DNS服务商账号</h3>
374374
</td>
375375
</tr>
376376
</tbody>
377+
378+
<!-- 更多选项 -->
379+
<tr>
380+
<td colspan="2"><more-options-indicator></more-options-indicator></td>
381+
</tr>
382+
383+
<tbody v-show="moreOptionsVisible">
384+
<tr>
385+
<td>最小TTL</td>
386+
<td>
387+
<div class="ui right labeled input">
388+
<input type="text" name="minTTL" size="4" maxlength="6" style="width: 6em"/>
389+
<span class="ui label"></span>
390+
</div>
391+
<p class="comment">生成的DNS时可以使用的最小TTL,请根据你选择的服务商和你在服务商中的账号等级进行填写;不填写或者0表示默认。</p>
392+
</td>
393+
</tr>
394+
</tbody>
377395
</table>
378396

379397
<submit-btn></submit-btn>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,11 @@ <h3>账号信息 <a href="" @click.prevent="updateProvider(provider.id)">[修改
278278
<td>{{provider.apiParams.secret}}</td>
279279
</tr>
280280
</tbody>
281+
282+
<tr v-if="provider.minTTL > 0">
283+
<td>最小TTL</td>
284+
<td>{{provider.minTTL}}秒</td>
285+
</tr>
281286
</table>
282287

283288

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

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -361,20 +361,38 @@ <h3>修改DNS服务商账号</h3>
361361

362362
<!-- 自定义HTTP-->
363363
<tbody v-if="provider.type == 'customHTTP'">
364+
<tr>
365+
<td>HTTP URL *</td>
366+
<td>
367+
<input type="text" name="paramCustomHTTPURL" maxlength="200" v-model="provider.params.url"/>
368+
<p class="comment">HTTP URL完整地址,DNS所有操作都会以POST的方式转发到此地址。</p>
369+
</td>
370+
</tr>
371+
<tr>
372+
<td>私钥 *</td>
373+
<td>
374+
<input type="text" name="paramCustomHTTPSecret" maxlength="64" v-model="provider.params.secret"/>
375+
<p class="comment">通讯用的私钥,转发请求时会在Header中加入相关信息,方便开发者校验请求是否合法。</p>
376+
</td>
377+
</tr>
378+
</tbody>
379+
380+
<!-- 更多选项 -->
364381
<tr>
365-
<td>HTTP URL *</td>
366-
<td>
367-
<input type="text" name="paramCustomHTTPURL" maxlength="200" v-model="provider.params.url"/>
368-
<p class="comment">HTTP URL完整地址,DNS所有操作都会以POST的方式转发到此地址。</p>
369-
</td>
370-
</tr>
371-
<tr>
372-
<td>私钥 *</td>
373-
<td>
374-
<input type="text" name="paramCustomHTTPSecret" maxlength="64" v-model="provider.params.secret"/>
375-
<p class="comment">通讯用的私钥,转发请求时会在Header中加入相关信息,方便开发者校验请求是否合法。</p>
376-
</td>
382+
<td colspan="2"><more-options-indicator></more-options-indicator></td>
377383
</tr>
384+
385+
<tbody v-show="moreOptionsVisible">
386+
<tr>
387+
<td>最小TTL</td>
388+
<td>
389+
<div class="ui right labeled input">
390+
<input type="text" name="minTTL" size="4" maxlength="6" style="width: 6em" v-model="provider.minTTL"/>
391+
<span class="ui label"></span>
392+
</div>
393+
<p class="comment">生成的DNS时可以使用的最小TTL,请根据你选择的服务商和你在服务商中的账号等级进行填写;不填写或者0表示默认。</p>
394+
</td>
395+
</tr>
378396
</tbody>
379397
</table>
380398

0 commit comments

Comments
 (0)