From ffdc273378071576130804b2b64ea0b91386b128 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Mon, 2 Jul 2018 10:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=8F=90=E4=BA=A4=E8=87=B3?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java | 2 +- .../configuration/maintenance/DnsResStrategyController.java | 2 +- src/main/java/com/nis/web/service/BaseService.java | 2 +- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- src/main/resources/messages/message_zh_CN.properties | 2 +- .../WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp | 2 +- .../WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java b/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java index a84ad6f29..97e87a321 100644 --- a/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java +++ b/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java @@ -200,7 +200,7 @@ public class NtcDnsResStrategy { this.cfgId = cfgId; } public void init() { - resGroup2Id=0; + resGroup2Id=0; resGroup2Num=0; resGroup3Id=0; resGroup3Num=0; diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index e52c7b13a..1194117f1 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -38,7 +38,7 @@ public class DnsResStrategyController extends BaseController { String ids, @ModelAttribute("cfg")DnsResStrategy cfg ,RedirectAttributes redirectAttributes){ - try { + try { if(cfg == null){ cfg=new DnsResStrategy(); } diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 51b2a0bd7..1ff185f6b 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -503,7 +503,7 @@ public abstract class BaseService { //ip转换为callback用ip public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){ NtcDnsResStrategy resStrategy=new NtcDnsResStrategy(); - resStrategy.init(); + resStrategy.init(); resStrategy.setId(Long.valueOf(cfg.getCompileId())); resStrategy.setCfgId(cfg.getCompileId()); resStrategy.setReqStrateId(cfg.getCfgId()); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 01909dbe6..5f4a7dc97 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -700,6 +700,6 @@ policy_number=policy number policy_name=policy name min_ttl=min ttl max_ttl=max ttl -ttl_unit=unit/s +ttl_unit=unit/s res_group_num=response number #=============about Maintenance========= \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index f519dff66..025867f00 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -684,6 +684,6 @@ policy_number=policy number policy_name=policy name min_ttl=min ttl max_ttl=max ttl -ttl_unit=unit/s +ttl_unit=unit/s res_group_num=response number #=============about Maintenance========= \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 3800364bd..c892ae06e 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -737,6 +737,6 @@ policy_number=\u7B56\u7565\u53F7 policy_name=\u7B56\u7565\u540D\u79F0 min_ttl=\u6700\u5C0F\u5B58\u6D3B\u65F6\u95F4 max_ttl=\u6700\u5927\u5B58\u6D3B\u65F6\u95F4 -ttl_unit=\u5355\u4F4D/\u79D2 +ttl_unit=\u5355\u4F4D/\u79D2 res_group_num=\u5E94\u7B54\u6570 #=============about Maintenance========= \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index 50d86e17f..01c91ce2e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -147,7 +147,7 @@ $(function(){
- " type="text" name="maxTtl" value="${_cfg.maxTtl}"> + " type="text" name="maxTtl" value="${_cfg.maxTtl}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 63bb7c05c..a1d83b763 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -258,7 +258,7 @@ - +