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

proxy intercept模块的monitor动作展示位Intercept

Browse Source
This commit is contained in:
duandongmei
2018-11-02 11:23:49 +08:00
parent 2402aff648
commit 1a01f78a08
3 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -352,35 +352,6 @@ public class ExportExcel {
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
} }
if("group".equals(headerStr)) {
commentStr="";
//查询ip复用地址池配置的policyGroup列表
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(2);
if(!StringUtil.isEmpty(list)){
for (PolicyGroupInfo policyGroupInfo : list) {
commentStr=commentStr+policyGroupInfo.getGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n";
index++;
}
}
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
if("isp".equals(headerStr)) {
commentStr="";
List<Integer> itTypeList = new ArrayList<Integer>();
itTypeList.add(Constants.ITEM_TYPE_ISP);
SysDictInfo sysDictInfo=new SysDictInfo();
sysDictInfo.setConditionType(itTypeList);
List<SysDictInfo> isps=sysDictInfoDao.findAllSysDictInfo(sysDictInfo,null);
if(!StringUtil.isEmpty(isps)){
for (SysDictInfo _sysDictInfo : isps) {
commentStr=commentStr+_sysDictInfo.getItemCode()+"（"+_sysDictInfo.getItemValue()+"）\n";
index++;
}
}
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
if(region.getRegionType().equals(1)){//IP配置 if(region.getRegionType().equals(1)){//IP配置
//ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction //ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction
//确定需要导入的srcIp srcPort destIp destPort信息 //确定需要导入的srcIp srcPort destIp destPort信息

5
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -203,7 +203,10 @@
value="${service.action }" class="required action" value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>> <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:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }"> <c:if test="${(dict.itemCode eq service.action) && (service.action eq 1) }">
<spring:message code="intercept"/>
</c:if>
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 1) }">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>

24
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -172,7 +172,12 @@
<form:select id="actionSelect" path="action" class="selectpicker select2 input-small" > <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option> <form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${serviceList}" var="service"> <c:forEach items="${serviceList}" var="service">
<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option> <c:if test="${service.action eq 1}">
<form:option value="${service.action }"><spring:message code="intercept"/></form:option>
</c:if>
<c:if test="${service.action ne 1}">
<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
</c:if>
</c:forEach> </c:forEach>
</form:select> </form:select>
<form:select path="isValid" class="selectpicker select2 input-small" > <form:select path="isValid" class="selectpicker select2 input-small" >
@@ -390,11 +395,18 @@
<td>${indexCfg.compileId }</td> <td>${indexCfg.compileId }</td>
<td>${indexCfg.cfgDesc }</td> <td>${indexCfg.cfgDesc }</td>
<td> <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:if test="${indexCfg.action eq 1}">
<c:if test="${dict.itemCode eq indexCfg.action }"> <spring:message code="intercept"/>
<spring:message code="${dict.itemValue }"/> </c:if>
</c:if> <c:if test="${indexCfg.action ne 1}">
</c:forEach> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</c:if>
</td> </td>
<c:if test="${cfg.functionId ne 212 }"> <c:if test="${cfg.functionId ne 212 }">