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

1.HTTP url、keyword、advanced配置跳转http日志菜单 2.snat地址池配置+跳转日志

Browse Source
This commit is contained in:
zhangwq
2018-12-09 17:12:40 +08:00
parent a4b3c670a0
commit 09b237e04d
6 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/sql/20181209/update_specific_service_cfg.sql Normal file
View File

@@ -0,0 +1,6 @@
UPDATE
specific_service_cfg c
SET
c.spec_service_code = c.spec_service_code + 10000
WHERE
c.cfg_type IN (2, 3) AND c.parent_id = 0;

6
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
View File

@@ -85,7 +85,7 @@
var dataArr = data.candidate_ip;
var html = ""
html = "<div style='width:98%; overflow: auto; height: 300px; margin-left: 1%; margin-right: 1%;'>"
html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;margin-top: 1%;'>";
html+="<tbody>";
if(dataArr.length == 0){
html+="<tr>";
@@ -121,7 +121,7 @@
success:function(data,status){
var html = ""
html = "<div style='width:98%; overflow: auto; height: 300px; margin-left: 1%; margin-right: 1%;'>"
html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;margin-top: 1%;'>";
html+="<tbody>";
if(data.length == 0){
html+="<tr>";
@@ -389,6 +389,7 @@
<th class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
<th class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
<th><spring:message code="available_ip_total"/></th>
<th><spring:message code="log_total"/></th>
<%-- <th><spring:message code="block_type"/></th> --%>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
@@ -420,6 +421,7 @@
</td>
<td>${cfg.ipTotal }</td>
<td audit="${cfg.isAudit}" addrPoolId="${cfg.cfgId }"><div class="loading-total"></div></td>
<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
<%-- <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

4
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp
View File

@@ -156,7 +156,7 @@ $(function(){
</div>
<div class="row ip">
<div class="col-md-6">
<div class="form-group">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select name="ipPattern" class="selectpicker show-tick form-control required">
@@ -169,7 +169,7 @@ $(function(){
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select name="portPattern" class="selectpicker show-tick form-control required">

2
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -561,7 +561,7 @@
</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 audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">

2
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
View File

@@ -69,7 +69,7 @@
haveInvisibleChar:"Теги {0} включают невидимый символ",
httpCheck:"Введите правильный URL(http[s]://xxx.xx)",
failed:"Неудачно",
go_back:"Вернуть назад Политики",
go_back:"Назад",
log_5_minutes:"Журнал за последние пять минут",
log_1_hour:"Журнал За последний час",
input:"Введите, пожалуйста ",

7
src/main/webapp/static/global/scripts/pzLog.js
View File

@@ -114,7 +114,7 @@ var toLogSearch = function(index){
var date=$(this).attr("date");
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
switchMenu("152");
switchMenu("152",functionId);
window.location.href = pathName+"/toLogSearch?service="+serviceId+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes";
}
@@ -122,7 +122,7 @@ var toLogSearch = function(index){
}
var switchMenu = function(topMenuId){
var switchMenu = function(topMenuId,functionId){
// 顶部菜单切换 menuId： Policies/86 Logs/152
$(".hor-menu ul li",parent.document).each(function(){
var id = $(this).children("a").attr("id");
@@ -144,6 +144,9 @@ var switchMenu = function(topMenuId){
middleMenu.push($(this).attr("menu-name"));
}
});
if(functionId == 8){
middleMenu.pop();
}
// 左侧菜单切换
$(".page-sidebar",parent.document).find("ul[id]").each(function(){