From 8f75a9dcc41ea54d86a0f47b1744bca5639c8985 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 7 Jun 2018 14:53:26 +0800
Subject: [PATCH] =?UTF-8?q?ip=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?tunnel=E9=99=A4IPSEC=E4=B9=8B=E5=A4=96=E7=9A=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=8F=E8=AE=AE=E7=BC=BA=E7=9C=81=E5=80=BC=E4=B8=BA?=
 =?UTF-8?q?0=EF=BC=8CIPSEC=E5=8D=8F=E8=AE=AE=E4=B8=80=E5=88=97=E4=B8=8A?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/ipInfo.jsp    | 81 ++++++++++++-------
 .../webapp/WEB-INF/views/cfg/iplist/form.jsp  |  7 +-
 2 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index b343bf6a0..64b8d5be4 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -16,6 +16,32 @@
 	            <div for="ipType"></div>
 	        </div>
 	    </div>
+	    <c:if test="${specialProtocol!=null and specialProtocol eq 'ipsec'}">
+	    	<div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+		            <div class="col-md-6">
+		            	<select name="protocol" class="selectpicker show-tick form-control required">
+	               			<c:choose>
+	               				<c:when test="${specialProtocol!=null and specialProtocol eq 'ipsec'}">
+	               					<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
+										<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
+			              			</c:forEach>
+	               				</c:when>
+	               				<c:otherwise>
+	               					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
+			              			</c:forEach>
+	               				</c:otherwise>
+	               			</c:choose>
+		                   
+		                </select>
+		                <input type="hidden" name="protocolId" value="0">
+		            </div>
+		            <div for="protocol"></div>
+		        </div>
+		    </div>
+	    </c:if>
 	</div>
 	<div class="row">
 	    <div class="col-md-6">
@@ -107,35 +133,32 @@
 			<div class="row protocol">
 		</c:otherwise>
 	</c:choose>
-	    <div class="col-md-6">
-	        <div class="form-group ">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
-	            <div class="col-md-6">
-	            	<select name="protocol" class="selectpicker show-tick form-control required">
-	            		<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
-							<c:if test="${sfi.itemCode==_cfg.functionId and sfi.itemValue eq 'ipsec'}">
-							<c:set var="specialProtocol" value="${sfi.itemValue}"/>
-							</c:if>
-               			</c:forEach>
-               			<c:choose>
-               				<c:when test="${specialProtocol!=null and specialProtocol eq 'ipsec'}">
-               					<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
-									<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
-		              			</c:forEach>
-               				</c:when>
-               				<c:otherwise>
-               					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-									<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
-		              			</c:forEach>
-               				</c:otherwise>
-               			</c:choose>
-	                   
-	                </select>
-	                <input type="hidden" name="protocolId" value="0">
-	            </div>
-	            <div for="protocol"></div>
-	        </div>
-	    </div>
+		<c:choose>
+			<c:when test="${specialProtocol!=null and specialProtocol eq 'tunnel'}">
+				<c:forEach items="${fns:getDictList('TUNNEL_PROTOCOL')}" var="protocolC">
+					<c:if test="${protocolC.itemValue eq 'default'}">
+					<input type="hidden" name="protocol" value="${protocolC.itemCode}">
+					</c:if>
+ 			</c:forEach>
+			</c:when>
+			<c:when test="${specialProtocol!=null and specialProtocol eq 'ipsec'}"></c:when>
+			<c:otherwise>
+	    		<div class="col-md-6">
+			        <div class="form-group ">
+			            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+			            <div class="col-md-6">
+		           				<select name="protocol" class="selectpicker show-tick form-control required">
+		           					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
+		            				</c:forEach>
+		           				</select>
+			                <input type="hidden" name="protocolId" value="0">
+			            </div>
+			            <div for="protocol"></div>
+			        </div>
+	    		</div>
+	    	</c:otherwise>
+        </c:choose>
 	    <div class="col-md-6">
 	        <div class="form-group">
 	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
index 01ceb91c8..c2e4f0196 100644
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
@@ -120,7 +120,12 @@ $(function(){
 								   </div>
 								</div>
 							<!-- desc and action -->
-                           <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
+							<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
+								<c:if test="${sfi.itemCode==_cfg.functionId}">
+								<c:set var="specialProtocol" value="${sfi.itemValue}"/>
+								</c:if>
+               				</c:forEach>
+           			   		<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>