From 4d0a341d6781ad11e17495846a23275666488c83 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 13 Jul 2018 11:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=E5=A4=8D=E7=94=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=20=E4=BF=AE=E6=94=B9=E5=9B=9E=E6=B5=81=E5=92=8C?=
 =?UTF-8?q?=E6=AC=BA=E9=AA=97=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  4 +-
 .../cfg/maintenance/ipMultiplexPool/form.jsp  | 66 +++++++++----------
 2 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index b7d999f94..5f988b89c 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -891,7 +891,7 @@ av_content_url_reject=Multimedia Content Url Control
 av_content_url_monit=Multimedia Content Url Monitoring
 av_pic_url_reject=Multimedia Picture Url Control
 av_pic_url_monit=Multimedia Picture Url Monitoring
-ip_loop=IP Configure Backflow
+ip_loop=IP Configure Loop
 website_dns_reject=Website DNS Control
 website_dns_monit=Website DNS Monitoring
 mail_reject=Mail Control
@@ -925,7 +925,7 @@ domain_monit=Domain Intercepter
 dns_strategy_reject=DNS Response Strategy Control
 proxy_http_req_body_replace=HTTP Request Content Replacement
 proxy_http_res_body_replace=HTTP Response Content Replacement
-dns_fake_ip_reject=DNS Fake IP Control
+dns_fake_ip_reject=DNS Spoofing IP Control
 app_strategy_reject=APP Strategy Control
 app_strategy_ratelimit=APP Strategy Speed Limit
 proxy_ip_redirect=IP Redirect
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
index a123c5007..0863d1622 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
@@ -73,25 +73,39 @@ $(function(){
 								        </div>
 								    </div>
 								    <div class="col-md-6">
-								        <div class="form-group">
+								        <div class="form-group"> 
+								            <label class="control-label col-md-3"><spring:message code="group_name"/></label>
+								            <div class="col-md-6">
+								            	<select name="policyGroup" class="selectpicker show-tick form-control">
+													<option value="0"><spring:message code="select"/></option>
+					               					<c:forEach items="${policyGroups }" var="policyGroup">
+														<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
+							              			</c:forEach>
+								                </select>
+								            </div>
+								        </div>
+								    </div>
+								    <div class="col-md-6 hidden">
+								        <div class="form-group"> 
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
 								            <div class="col-md-6">
 								            	<c:forEach items="${serviceList}" var="service"
-													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-																	<c:if test="${dict.itemCode eq service.action }">
-																		<spring:message code="${dict.itemValue }"/>
-																	</c:if>
-																</c:forEach>
-														</c:if>
-													</label>
-												</c:forEach>
+																		varStatus="satus">
+																		<label class="radio-inline"> <c:if
+																				test="${_cfg.functionId eq service.functionId}">
+																				<input type="radio" name="action"
+																					serviceId="${service.serviceId }"
+																					protocolId="${service.protocolId }"
+																					value="${service.action }" class="required action"
+																					<c:if test="${_cfg.action==service.action || _cfg.action==null}">checked</c:if>>
+																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																						<c:if test="${dict.itemCode eq service.action }">
+																							<spring:message code="${dict.itemValue }"/>
+																						</c:if>
+																					</c:forEach>
+																			</c:if>
+																		</label>
+																	</c:forEach>
 								            </div>
 								            <div for="action"></div>
 								       </div>
@@ -113,11 +127,6 @@ $(function(){
 										    <div for="ipType"></div>
 								        </div>
 								    </div>
-								    <div class="col-md-6 hidden">
-								    	<select name="ipPattern">
-											<option value="3"></option>
-										</select>
-								   </div>
 								   <div class="col-md-6">
 										<div class="form-group ">
 											<label class="control-label col-md-3"><font color="red">*</font>
@@ -189,21 +198,6 @@ $(function(){
 									</div>
 								</div>
 								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="group_name"/></label>
-								            <div class="col-md-6">
-								            	<select name="policyGroup" class="selectpicker show-tick form-control">
-													<option value="0"><spring:message code="select"/></option>
-					               					<c:forEach items="${policyGroups }" var="policyGroup">
-														<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
-							              			</c:forEach>
-								                </select>
-								            </div>
-								        </div>
-								    </div>
-								</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">