gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

（1）IPSEC特殊协议的修改

Browse Source 
（2）IP配置审核修改
This commit is contained in:
wangxin
2018-06-06 11:00:33 +08:00
parent 129923f7c1
commit 1e4f717bc7
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -205,7 +205,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
Map<String,List> map = cfgConvert(ipRegionList,beans,1,cfg,groupRelationList); Map<String,List> map = cfgConvert(ipRegionList,beans,1,cfg,groupRelationList);
ipRegionList=map.get("dstList"); ipRegionList=map.get("dstList");
groupRelationList=map.get("groupList"); 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); Map<String,List> areaMap = cfgConvert(areaIpRegionList,beans1,1,cfg,groupRelationList);
groupRelationList=areaMap.get("groupList"); groupRelationList=areaMap.get("groupList");
areaIpRegionList=areaMap.get("dstList"); areaIpRegionList=areaMap.get("dstList");

2
src/main/java/com/nis/web/service/configuration/StringCfgService.java
View File

@@ -135,7 +135,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setVersion(Constants.MAAT_VERSION);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
logger.info("文件样例下发配置参数："+json); logger.info("域名白名单配置："+json);
//调用服务接口下发配置 //调用服务接口下发配置
try { try {
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);

21
src/main/webapp/WEB-INF/include/form/ipInfo.jsp
View File

@@ -112,9 +112,24 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="protocol" class="selectpicker show-tick form-control required"> <select name="protocol" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC"> <c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
<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:if test="${sfi.itemCode==_cfg.functionId and sfi.itemValue eq 'ipsec'}">
</c:forEach> <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> </select>
<input type="hidden" name="protocolId" value="0"> <input type="hidden" name="protocolId" value="0">
</div> </div>