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

调整通联日志域名国际化不对应

Browse Source 
调整日志导出后结束时间和开始时间范围一致
This commit is contained in:
leijun
2019-01-09 16:49:40 +08:00
parent 9a06ee9dce
commit 9a861d9229
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -2420,7 +2420,7 @@ public class BaseController {
logTime+=" "+msgProp.getProperty("begin_date")+"："+log.getSearchFoundStartTime(); logTime+=" "+msgProp.getProperty("begin_date")+"："+log.getSearchFoundStartTime();
} }
if(log.getSearchFoundEndTime()!=null){ if(log.getSearchFoundEndTime()!=null){
logTime+=" "+msgProp.getProperty("end_date")+"："+log.getSearchFoundStartTime(); logTime+=" "+msgProp.getProperty("end_date")+"："+log.getSearchFoundEndTime();
} }
return logTime; return logTime;
} }

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

@@ -286,7 +286,7 @@
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label class="control-label"><spring:message code='Web'/>：</label> <label class="control-label"><spring:message code="domain_name"/>：</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"/>"> <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" > <c:forEach items="${webList}" var="web" >
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option> <option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
@@ -360,7 +360,7 @@
<th class="sort-column app_id" column="APP">APP</th> <th class="sort-column app_id" column="APP">APP</th>
<th class="sort-column proto_id" column="application_layer_protocol"><spring:message code="application_layer_protocol"/></th> <th class="sort-column proto_id" column="application_layer_protocol"><spring:message code="application_layer_protocol"/></th>
<th class="sort-column web_id" column="Web"><spring:message code="domain_name"/></th> <th class="sort-column web_id" column="domain_name"><spring:message code="domain_name"/></th>
<th class="sort-column cap_ip" column="clj_ip"><spring:message code="clj_ip"/></th> <th class="sort-column cap_ip" column="clj_ip"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto" column="transport_layer_protocol" isVisible="false"><spring:message code="transport_layer_protocol"/></th> <th class="sort-column trans_proto" column="transport_layer_protocol" isVisible="false"><spring:message code="transport_layer_protocol"/></th>