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

(1)修复doLog选择默认值的选择器无法匹配到结果

Browse Source 
(2)Protocol菜单提交doLog修改
This commit is contained in:
wangxin
2019-01-13 00:18:20 +08:00
parent a38d337776
commit 3c48c80e76
21 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/sql/20190112/function_service_dict_add_do_log.sql
View File

@@ -63,6 +63,10 @@ UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=132 AN
UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=20 AND function_id=37;
#Mail WhiteList
UPDATE function_service_dict SET config_do_log='0;0;0' WHERE service_id=66 AND function_id=37;
#Mail advanced Monitor
UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=132 AND function_id=35;
#Mail advanced Block
UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=20 AND function_id=35;
#FTP Monitor
UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=133 AND function_id=51;
#FTP Block

2
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -451,7 +451,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq cfg.doLog }">
<c:if test="${dict.itemCode eq cfg.doLog and cfg.action!=64}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

1
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
View File

@@ -199,6 +199,7 @@
<input type="radio" name="action" serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">

1
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -199,6 +199,7 @@
<input type="radio" name="action" serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">

2
src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
View File

@@ -451,7 +451,7 @@
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq cfg.doLog }">
<c:if test="${dict.itemCode eq cfg.doLog and cfg.action!=64}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
View File

@@ -448,7 +448,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq cfg.doLog }">
<c:if test="${dict.itemCode eq cfg.doLog and cfg.action!=64}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

3
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -203,6 +203,7 @@
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">
@@ -219,7 +220,7 @@
</div>
</div>
<!-- dolog begin-->
<div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

5
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
View File

@@ -174,9 +174,10 @@
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">
@@ -192,7 +193,7 @@
</div>
</div>
</div>
<div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

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

@@ -409,14 +409,14 @@
<th column="userregion1" ><spring:message code="intercept_intensity"/></th>
</c:if> --%>
<th column="is_audit" ><spring:message code="is_audit"/></th>
<%-- <th column="do_log" ><spring:message code="do_log"/></th> --%>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th>
<th column="classification" ><spring:message code="classification"/></th>
<th column="attribute" ><spring:message code="attribute"/></th>
<th column="label" ><spring:message code="label"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
<th column="do_log" ><spring:message code="do_log"/></th>
<th column="log_total" ><spring:message code="log_total"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
@@ -552,13 +552,6 @@
<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
</c:choose>
</td>
<%-- <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td> --%>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">
@@ -631,7 +624,14 @@
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td>
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
<td>${indexCfg.creatorName }</td>
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${indexCfg.editorName }</td>

2
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -422,7 +422,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=64 and indexCfg.action!=32}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

3
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -206,6 +206,7 @@
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">
@@ -222,7 +223,7 @@
</div>
</div>
<!-- dolog begin-->
<div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

2
src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
View File

@@ -416,7 +416,7 @@
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=128}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

1
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -170,6 +170,7 @@
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">

3
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -184,6 +184,7 @@
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">
@@ -199,7 +200,7 @@
</div>
</div>
</div>
<div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

3
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -244,6 +244,7 @@
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">
@@ -260,7 +261,7 @@
</div>
</div>
<div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

3
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -188,6 +188,7 @@
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">
@@ -204,7 +205,7 @@
</div>
</div>
<!-- dolog begin-->
<div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

1
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -175,6 +175,7 @@
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDoLog="${service.configDoLog }"
value="${service.action }" class="required action"
<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">

2
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

@@ -393,7 +393,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=128}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

@@ -198,7 +198,7 @@
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action" class="action"
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"

22
src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
View File

@@ -368,8 +368,7 @@
<th column="cfg_id" class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th column="do_log" ><spring:message code="do_log"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<%--<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th>
<th column="classification" ><spring:message code="classification"/></th>
<th column="attribute" ><spring:message code="attribute"/></th>
@@ -377,7 +376,8 @@
<th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
<th column="do_log" ><spring:message code="do_log"/></th>
<th column="log_total" ><spring:message code="log_total"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
@@ -403,13 +403,6 @@
</c:forEach>
</td>
<%-- <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">
<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
@@ -489,7 +482,14 @@
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
</td>
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td>${indexCfg.creatorName }</td>
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${indexCfg.editorName }</td>

10
src/main/webapp/static/global/scripts/doLog.js
View File

@@ -30,7 +30,7 @@ var processDoLog=function(doLog){
if(dologOptionValues.length==1){
$(".doLog").find("[name='doLog']").each(function(){
if($(this).val()==dologObj.options){
$(this).attr("checked",true);
$(this).prop("checked",true);
$(this).parents(".radio-inline").removeClass("hidden");
}else{
$(this).removeAttr("checked");
@@ -52,10 +52,10 @@ var processDoLog=function(doLog){
$(this).parents(".radio-inline").addClass("hidden");
}
});
if($(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible")){
$(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible").attr("checked",true);
}else if($(".doLog").find("[name$='doLog'] [value='"+defaults+"']:visible")){//默认值为2
$(".doLog").find("[name$='doLog'] [value='2']:visible").attr("checked",true);
if($("input[name$='doLog'][value='"+doLogValue+"']:visible").length>0){
$("input[name$='doLog'][value='"+doLogValue+"']:visible").prop("checked",true);
}else if($("input[name$='doLog'][value='"+defaults+"']:visible").length>0){//默认值为2
$("input[name$='doLog'][value='"+defaults+"']:visible").prop("checked",true);
}
}