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

1.修正通联关系web查询条件与数据显示对象属性引用错误；

Browse Source 
2.所有日志列表的查询条件，删除direction的查询条件。
This commit is contained in:
zhangwei
2019-01-08 11:00:22 +06:00
parent c564000736
commit 61cd6bb6e7
21 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/messages/message_ru.properties
View File

@@ -1462,7 +1462,7 @@ asn_name=ASN Name
details=Details
NTC_ASN_NUMBER=ASN
application_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b
traffic_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 \u0422\u0440\u0430\u0444\u0438\u043A\u0430
traffic_statistics=\u041F\u0440\u043E\u043F\u0443\u0441\u043A\u043D\u0430\u044F \u0421\u043F\u043E\u0441\u043E\u0431\u043D\u043E\u0441\u0442\u044C \u0422\u0440\u0430\u0444\u0438\u043A\u0430
active_ip_statistics= \u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 \u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0445 IP-\u0430\u0434\u0440\u0435\u0441\u043E\u0432
protocol_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 \u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u043E\u0432
app_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 \u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0439

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1458,7 +1458,7 @@ asn_name=ASN\u7ec4\u7ec7\u540d
details=\u8be6\u60c5
NTC_ASN_NUMBER=ASN
application_layer_protocol=\u5e94\u7528\u5c42\u534f\u8bae
traffic_statistics=\u6D41\u91CF\u7EDF\u8BA1
traffic_statistics=\u6D41\u91CF\u541E\u5410\u91CF
active_ip_statistics=\u6D3B\u8DC3IP\u7EDF\u8BA1
protocol_statistics=\u534F\u8BAE\u7EDF\u8BA1
app_statistics=App\u7EDF\u8BA1

4
src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
View File

@@ -113,7 +113,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -123,7 +123,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/>：</label>

13
src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
View File

@@ -241,7 +241,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -251,7 +251,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<%-- <div class="row">
<div class="col-md-2">
@@ -288,7 +288,7 @@
<label class="control-label"><spring:message code='Web'/>：</label>
<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<c:forEach items="${webList}" var="web" >
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
<option value="${web.id}"><spring:message code="${web.domain}"></spring:message></option>
</c:forEach>
</select>
</div>
@@ -424,10 +424,13 @@
<td>
<c:set var="webIds">${log.webId }</c:set>
<c:forEach items="${webList}" var="dict">
<c:if test="${dict.code eq log.webId}">
<c:set var="webIds">${dict.item}</c:set>
<c:if test="${dict.id eq log.webId}">
<c:set var="webIds">${dict.domain}</c:set>
</c:if>
</c:forEach>
<c:if test="${webIds eq '0' }">
<c:set var="webIds">N/A</c:set>
</c:if>
<spring:message code="${webIds}"/>
</td>

4
src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
View File

@@ -198,7 +198,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -208,7 +208,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
View File

@@ -227,7 +227,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -237,7 +237,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">

4
src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
View File

@@ -209,7 +209,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -219,7 +219,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">

4
src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
View File

@@ -198,7 +198,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -208,7 +208,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
View File

@@ -99,7 +99,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -109,7 +109,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/>：</label>

4
src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp
View File

@@ -160,7 +160,7 @@
<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -170,7 +170,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp
View File

@@ -160,7 +160,7 @@
<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -170,7 +170,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
View File

@@ -111,7 +111,7 @@
</form:select>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control select2">
@@ -121,7 +121,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/>：</label>

4
src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
View File

@@ -113,7 +113,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -123,7 +123,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/>：</label>

4
src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
View File

@@ -197,7 +197,7 @@ $(document).ready(function(){
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -207,7 +207,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
View File

@@ -196,7 +196,7 @@ $(document).ready(function(){
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -206,7 +206,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
View File

@@ -169,7 +169,7 @@ $(document).ready(function(){
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -179,7 +179,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
View File

@@ -110,7 +110,7 @@
</form:select>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control select2">
@@ -120,7 +120,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/>：</label>

4
src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
View File

@@ -168,7 +168,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -178,7 +178,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<%-- <div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
View File

@@ -113,7 +113,7 @@ $(document).ready(function(){
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker select2 form-control">
@@ -123,7 +123,7 @@ $(document).ready(function(){
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="entrance"/>：</label>

4
src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
View File

@@ -214,7 +214,7 @@
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control select2">
@@ -224,7 +224,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">

4
src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
View File

@@ -179,7 +179,7 @@
<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
</div>
</div>
<div class="col-md-2">
<%-- <div class="col-md-2">
<div class="form-group">
<label class="control-label"><spring:message code="direction"/>：</label>
<form:select path="direction" class="selectpicker form-control">
@@ -189,7 +189,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
</div>
<div class="row">
<div class="col-md-2">