From 1e4f717bc76de6d550b560b1a711bb9ba0f16f5d Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 6 Jun 2018 11:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89IPSEC=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=9A=84=E4=BF=AE=E6=94=B9=20=EF=BC=882?=
 =?UTF-8?q?=EF=BC=89IP=E9=85=8D=E7=BD=AE=E5=AE=A1=E6=A0=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/IpCfgService.java   |  2 +-
 .../configuration/StringCfgService.java       |  2 +-
 .../webapp/WEB-INF/include/form/ipInfo.jsp    | 21 ++++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 0cb67ec6d..86549ab9d 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -205,7 +205,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 				Map<String,List> map = cfgConvert(ipRegionList,beans,1,cfg,groupRelationList);
 				ipRegionList=map.get("dstList");
 				groupRelationList=map.get("groupList");
-				numRegionList=map.get("numRegionList");
+				numRegionList=map.get("numRegionList")==null?new ArrayList<>():map.get("numRegionList");
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,beans1,1,cfg,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
 				areaIpRegionList=areaMap.get("dstList");
diff --git a/src/main/java/com/nis/web/service/configuration/StringCfgService.java b/src/main/java/com/nis/web/service/configuration/StringCfgService.java
index db4da0374..6be205ba2 100644
--- a/src/main/java/com/nis/web/service/configuration/StringCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/StringCfgService.java
@@ -135,7 +135,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			//调用服务接口下发配置数据
 			String json=gsonToJson(maatBean);
-			logger.info("文件样例下发配置参数："+json);
+			logger.info("域名白名单配置："+json);
 			//调用服务接口下发配置
 			try {
 				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index 1b0145f65..b343bf6a0 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -112,9 +112,24 @@
 	            <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>
+	            		<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>