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

去除http monit 日志总量列、修复http 操控阻断日志跳转

Browse Source
This commit is contained in:
wangwei
2019-06-10 11:48:21 +08:00
parent ee513ccdae
commit dace2ab798
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -412,6 +412,8 @@ public class HttpRedirectPolicyController extends BaseController {
cfgIndexInfoNoExport = ",policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
} else if (entity.getFunctionId() == 211) {
cfgIndexInfoNoExport = ",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
}else if (entity.getFunctionId() == 210) {
cfgIndexInfoNoExport = ",log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
}
String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time"

15
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -598,7 +598,7 @@
<c:if test="${action ne 128}">
<th column="do_log" ><spring:message code="do_log"/></th>
</c:if>
<c:if test="${action ne 128 && action ne 16}">
<c:if test="${action ne 128 && action ne 16 && action ne 1}">
<th column="log_total" ><spring:message code="log_total"/></th>
</c:if>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
@@ -620,8 +620,15 @@
<td>
<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
</td>
<td>${indexCfg.compileId }</td>
</td>
<c:choose>
<c:when test='${(action eq 16 || action eq 1) && (indexCfg.isAudit eq 1 || indexCfg.isAudit eq 3)}'>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}">${indexCfg.compileId }</td>
</c:when>
<c:otherwise>
<td>${indexCfg.compileId }</td>
</c:otherwise>
</c:choose>
<td>${indexCfg.cfgDesc }</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -718,7 +725,7 @@
</c:forEach>
</td>
</c:if>
<c:if test="${action ne 128 && action ne 16}">
<c:if test="${action ne 128 && action ne 16 && action ne 1}">
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
</c:if>
<td>