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 9b8beaed3..4e45f7c12 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 @@ -46,12 +46,12 @@ public class DnsResStrategyController extends BaseController { initFormCondition(model, cfg); model.addAttribute("isAdd", false); }else{ - //不存在响应策略为0的配置,则新策略时,cfgId默认为0 + /*//不存在响应策略为0的配置,则新策略时,cfgId默认为0 DnsResStrategy dns0=dnsResStrategyService.getDnsResStrategy(0l,null); if(dns0 == null){ cfg.setCfgId(0l); cfg.setCfgDesc("无策略"); - } + }*/ initFormCondition(model, cfg); model.addAttribute("isAdd", true); } diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index bc2b53131..a93256c13 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -123,6 +123,7 @@ AND r.function_id=#{functionId,jdbcType=INTEGER} + 0]]> ${sqlMap.dsf} @@ -159,6 +160,7 @@ AND r.CFG_ID=#{cfgId,jdbcType=BIGINT} + 0]]> order by cfg_Id diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 96975b8d0..08a8d9c4a 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -384,7 +384,7 @@ ip_type=IP\u7C7B\u578B #==========tedingfuwu begin===================== protocol_code=\u534F\u8BAE\u53F7 protocol_name=\u534F\u8BAE\u540D\u79F0 -group_id=maat\u7AEF\u914D\u7F6E\u5206\u7EC4ID +group_id=\u914D\u7F6E\u5206\u7EC4ID input_protocol_id=\u8BF7\u8F93\u5165\u534F\u8BAEID input_integer=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6574\u6570\u503C protocol_desc=\u534F\u8BAE\u63CF\u8FF0 diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp index 021db0cab..35b0355de 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp @@ -77,6 +77,7 @@ $(function(){
readonly="true" type="text" id="cfgId" name="cfgId" value="${_cfg.cfgId}"> + readonly="true" type="text" id="cfgId" min="101" name="cfgId" value="${_cfg.cfgId}">
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 9798be73f..bd622554f 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 @@ -286,7 +286,9 @@ - + + + ${cfg.cfgId }
- +
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 2d724d6b3..a40b0256a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -175,6 +175,7 @@ code="policy_name" />
- +