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

domainSub界面的十六进制信息展示更改

Browse Source 
摘要审核失败bug更改
文件拦截策略表单必填项增加校验
dnat复用地址池隐藏方向属性
snat复用地址池隐藏方向属性
This commit is contained in:
duandongmei
2018-10-06 15:01:10 +08:00
parent d7d0ad706f
commit 210ba71901
5 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -556,9 +556,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList(); List<IpCfg> areaIpRegionList = new ArrayList();
if(isAudit==1){ if(isAudit==1){
entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList); Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
groupRelationList=map.get("groupList"); groupRelationList=map.get("groupList");
digestRegionList=map.get("dstList"); digestRegionList=map.get("dstList");

2
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
View File

@@ -154,7 +154,7 @@ var switchKeyringType=function(){
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="keyring_type"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="keyring_type"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="keyringType" class="selectpicker show-tick form-control"> <select name="keyringType" class="selectpicker show-tick form-control required">
<option value="" <c:if test="${empty cfg.keyringType}">selected</c:if>><spring:message code="select"/></option> <option value="" <c:if test="${empty cfg.keyringType}">selected</c:if>><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('INTERCEPT_CERTIFICATE_TYPE')}" var="keyringType"> <c:forEach items="${fns:getDictList('INTERCEPT_CERTIFICATE_TYPE')}" var="keyringType">
<option value="${keyringType.itemCode}" <c:if test="${_cfg.keyringType==keyringType.itemCode}">selected</c:if> ><spring:message code="${keyringType.itemValue}"/></option> <option value="${keyringType.itemCode}" <c:if test="${_cfg.keyringType==keyringType.itemCode}">selected</c:if> ><spring:message code="${keyringType.itemValue}"/></option>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
View File

@@ -174,7 +174,7 @@ $(function(){
<div for="port"></div> <div for="port"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6 hidden">
<div class="form-group "> <div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font> <label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="direction" /></label> <spring:message code="direction" /></label>

4
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp
View File

@@ -150,8 +150,8 @@ $(function(){
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row hidden">
<div class="col-md-6 hidden"> <div class="col-md-6 ">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label>
<div class="col-md-6"> <div class="col-md-6">

72
src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
View File

@@ -159,18 +159,72 @@
</div> </div>
</div> </div>
</div> </div>
<c:if test="${cfg.isHexbin==0 }">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label> <label><spring:message code="is_hex"/>:</label>
<label> <label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC"> <spring:message code="not_hex"/>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if> </label>
</c:forEach> </div>
</label>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="is_case_insenstive"/>:</label>
<label>
<spring:message code="case_insenstive"/>
</label>
</div>
</div>
</div>
</c:if>
<c:if test="${cfg.isHexbin==1 }">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="is_hex"/>:</label>
<label>
<spring:message code="hex"/>
</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="is_case_insenstive"/>:</label>
<label>
<spring:message code="case_insenstive"/>
</label>
</div>
</div>
</div>
</c:if>
<c:if test="${cfg.isHexbin==2 }">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="is_hex"/>:</label>
<label>
<spring:message code="not_hex"/>
</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="is_case_insenstive"/>:</label>
<label>
<spring:message code="case_senstive"/>
</label>
</div>
</div>
</div>
</c:if>
</div> </div>
</c:if> </c:if>
</c:forEach> </c:forEach>