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

HTTP日志列表动作检索修改.

Browse Source
This commit is contained in:
zhangwq
2018-12-09 19:14:13 +08:00
parent 09b237e04d
commit 2988cb7145
5 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
View File

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -21,7 +20,6 @@ import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.log.NtcHttpLog;
import com.nis.domain.log.NtcKeywordsUrlLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
@@ -45,6 +43,22 @@ public class HttpLogController extends BaseController {
initLogSearchValue(log, params);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
for (FunctionServiceDict serviceDict : serviceList) {
if(serviceDict.getFunctionId() == log.getFunctionId()){
if(serviceDict.getAction() == Constants.MONIT_ACTION){
serviceDict.setActionCode("log_search_http_monit");
}else if(serviceDict.getAction() == Constants.REJECT_ACTION){
serviceDict.setActionCode("log_search_http_reject");
}
}else{
if(serviceDict.getAction() == Constants.MONIT_ACTION){
serviceDict.setActionCode("log_search_keyword_monit");
}else if(serviceDict.getAction() == Constants.REJECT_ACTION){
serviceDict.setActionCode("log_search_keyword_reject");
}
}
}
model.addAttribute("serviceList", serviceList);
String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_LOG;

6
src/main/resources/messages/message_en.properties
View File

@@ -1354,4 +1354,8 @@ original_dest_port=Original destination port
translated_dest_ip=Post-translational destination address
translated_dest_port=Post-translational destination port
show_ips=View all IP
show_available_ips=View available IP
show_available_ips=View available IP
log_search_http_monit=HTTP Monitor
log_search_http_reject=HTTP Block
log_search_keyword_monit=Keyword Monitor
log_search_keyword_reject=Keyword Block

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

@@ -1355,4 +1355,8 @@ original_dest_port=Original destination port
translated_dest_ip=Post-translational destination address
translated_dest_port=Post-translational destination port
show_ips=View all IP
show_available_ips=View available IP
show_available_ips=View available IP
log_search_http_monit=HTTP Monitor
log_search_http_reject=HTTP Block
log_search_keyword_monit=Keyword Monitor
log_search_keyword_reject=Keyword Block

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

@@ -1352,4 +1352,10 @@ original_dest_port=\u539F\u59CB\u76EE\u7684\u7AEF\u53E3
translated_dest_ip=\u7FFB\u8BD1\u540E\u76EE\u7684\u5730\u5740
translated_dest_port=\u7FFB\u8BD1\u540E\u76EE\u7684\u7AEF\u53E3
show_ips=\u67E5\u770B\u6240\u6709IP
show_available_ips=\u67E5\u770B\u53EF\u7528IP
show_available_ips=\u67E5\u770B\u53EF\u7528IP
website_keyword_monit=\u5173\u952E\u5B57\u76D1\u6D4B
website_keyword_reject=\u5173\u952E\u5B57\u963B\u65AD
log_search_http_monit=HTTP\u76D1\u6D4B
log_search_http_reject=HTTP\u963B\u65AD
log_search_keyword_monit=\u5173\u952E\u5B57\u76D1\u6D4B
log_search_keyword_reject=\u5173\u952E\u5B57\u963B\u65AD

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

@@ -94,14 +94,14 @@
<div class="pull-left">
<form:select path="service" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<c:forEach items="${serviceList}" var="service" varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) }">
<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
<form:option value="${service.serviceId}"><spring:message code="${service.actionCode}"/></form:option>
</c:if>
</c:forEach>
</c:forEach>
</form:select>
</div>
<div class="pull-left">