From 7560d7bb4285d2b6e541a2f9550420d4801d0073 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 18 Jul 2018 20:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9group=5Fid=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E4=B8=AD=E6=96=87=20=E9=9A=90=E8=97=8FdnsResStrategy?=
 =?UTF-8?q?=20=E6=97=A0=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E5=8E=BB=E6=8E=89dnsResStrategy=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E7=AD=96=E7=95=A5=E5=8F=B7=20?=
 =?UTF-8?q?=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0title?=
 =?UTF-8?q?=E7=9A=84=E5=BF=85=E8=BE=93=E9=A1=B9=E9=AA=8C=E8=AF=81=20?=
 =?UTF-8?q?=E7=89=B9=E5=AE=9A=E5=8D=8F=E8=AE=AE=E9=9A=90=E8=97=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=88=86=E7=BB=84ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/DnsResStrategyController.java              | 4 ++--
 .../com/nis/web/dao/configuration/DnsResStrategyDao.xml    | 2 ++
 src/main/resources/messages/message_zh_CN.properties       | 2 +-
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp         | 1 +
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp  | 7 +------
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp  | 4 +++-
 src/main/webapp/WEB-INF/views/cfg/requestForm.jsp          | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp      | 1 +
 .../WEB-INF/views/specific/specificServiceCfgForm.jsp      | 2 +-
 .../WEB-INF/views/specific/specificServiceCfgList.jsp      | 2 +-
 10 files changed, 15 insertions(+), 14 deletions(-)

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 @@
 	    	<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
+	    	<![CDATA[ and r.cfg_id <> 0]]>
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
 	    </trim>
@@ -159,6 +160,7 @@
 	   	 <if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
    		</if>
+   		<![CDATA[ and r.cfg_id <> 0]]>
 	    </where>
 	    order by cfg_Id
 	</select>
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(){
 								            <label class="control-label col-md-3"><spring:message code="policy_name"/></label>
 								            <div class="col-md-6">
 								            	<select name="dnsStrategyId" class="selectpicker show-tick form-control">
+														<option value="0" ><spring:message code="select"/></option>
 					               					<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
 														<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
 							              			</c:forEach>
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 6ad9cb731..25418e12f 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
@@ -24,11 +24,6 @@ $(function(){
 			var flag = true;
 			var cfgId=$("#cfgId").val();
 			var message="";
-			if(cfgId <=100 && cfgId != 0){
-				//message="策略号值只能为0，或大于100";
-				message="<spring:message code='policy_number_value_valid'/>";
-				flag=false;
-			}
 			if(flag){
 				if($("#isAdd").val() == 'true'){
 					$.ajax({
@@ -103,7 +98,7 @@ $(function(){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_number"/></label>
 								            <div class="col-md-6">
-								                <input class="form-control required number" <c:if test="${!isAdd}" >readonly="true"</c:if>  type="text" id="cfgId" name="cfgId" value="${_cfg.cfgId}">
+								                <input class="form-control required number" <c:if test="${!isAdd}" >readonly="true"</c:if>  type="text" id="cfgId" min="101" name="cfgId" value="${_cfg.cfgId}">
 								            </div>
 									    <div for="cfgId"></div>
 								        </div>
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 @@
 							<tbody>
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
-									<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
+									<td>
+										<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
+									</td>
 									<td>${cfg.cfgId }</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.cfgDesc}"
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
index b2fc5e784..94ca96e4a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
@@ -42,9 +42,9 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><spring:message code="title"></spring:message>:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="title"></spring:message>:</label>
 								<div class="col-md-4">
-									<input type="text" class="form-control" name="requestTitle" maxlength="512" value="${requestInfo.requestTitle}">
+									<input type="text" class="form-control required" name="requestTitle" maxlength="512" value="${requestInfo.requestTitle}">
 								</div>
 							</div>
 							<div class="form-group">
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" /></label>
 											<div class="col-md-6">
 												<select name="dnsStrategyId" class="selectpicker show-tick form-control">
+												<option value="0" ><spring:message code="select"/></option>
 					               					<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
 														<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
 							              			</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index 2b1bd7ff4..f2b9ed711 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -117,7 +117,7 @@
 						 	<div class="form-group">
 								<label class="col-md-3 control-label"><spring:message code="group_id"/>:</label>
 								<div class="col-md-4">
-									<form:input path="groupId" htmlEscape="false" maxlength="50" range="[0,2147483647]" class="form-control digits" placeholder="0"/>
+									<form:input path="groupId" htmlEscape="false" maxlength="50" range="[0,2147483647]" class="form-control digits hidden" placeholder="0"/>
 								</div>
 							</div> 
 							<%-- <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index 296038c60..a556e1911 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -163,7 +163,7 @@
 													<option value="specServiceName"><spring:message code="protocol_name"/></option>
 												</select>
                                             </div>
-                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_code'/>" type="text" onchange="casec()" maxlength="60">
+                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_name'/>" type="text" onchange="casec()" maxlength="60">
                                     
                                             
                                         </div>