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

修正HTTP报表action显示，去除无用国际化代码

Browse Source
This commit is contained in:
zhangwenqing
2018-12-19 19:21:16 +08:00
parent f59d87b7d0
commit 7f77856051
6 changed files with 17 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,31 +503,9 @@ public class BaseController {
protected void initReportCondition(Model model, SearchReport report) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId());
// HTTP(+keyword)报表处理
// HTTP +keyword
if(report.getFunctionId() == 8){
serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
for (FunctionServiceDict serviceDict : serviceList) {
if(serviceDict.getFunctionId() == report.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");
}
}
}
}else{
String prefix = "action_";
for (FunctionServiceDict serviceDict : serviceList) {
if(!serviceDict.getActionCode().contains(prefix)){
serviceDict.setActionCode(prefix+serviceDict.getActionCode());
}
}
}
model.addAttribute("serviceList", serviceList);

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

@@ -23,7 +23,6 @@ import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.SysUser;
import com.nis.domain.log.NtcHttpLog;
import com.nis.domain.log.NtcHttpLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
@@ -53,21 +52,6 @@ public class HttpLogController extends BaseController {
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;
@@ -124,21 +108,6 @@ public class HttpLogController extends BaseController {
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;

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

@@ -1355,10 +1355,6 @@ translated_dest_ip=Translated destination address
translated_dest_port=Translated destination port
show_ips=View all 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
radius_log=Radius Identify
message_type=Code
nas_ip=NAS IP Address

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

@@ -1359,10 +1359,6 @@ translated_dest_ip=\u041f\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043d\u043d\
translated_dest_port=\u041f\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u041f\u043e\u0440\u0442 \u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f
show_ips=\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0412\u0441\u0435 IP
show_available_ips=\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0439 IP
log_search_http_monit=HTTP \u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433
log_search_http_reject=HTTP \u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
log_search_keyword_monit=\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433 \u041a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0421\u043b\u043e\u0432
log_search_keyword_reject=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u041a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0421\u043b\u043e\u0432
radius_log=Radius Identify
message_type=Code
nas_ip=NAS IP Address

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

@@ -1355,10 +1355,6 @@ show_ips=\u67e5\u770b\u6240\u6709IP
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
radius_log=Radius \u534f\u8bae
message_type=Code
nas_ip=NAS IP Address

18
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -380,7 +380,14 @@ white-space:nowrap;
<spring:message code="total"/>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemCode eq service.action}">
<spring:message code="${service.actionCode}"/>
<c:choose>
<c:when test="${(service.serviceId eq 40) || (service.serviceId eq 152)}">
<spring:message code="keywords"/> <spring:message code="${action.itemValue}"/>
</c:when>
<c:otherwise>
<spring:message code="${action.itemValue}"/>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
<span>0</span>
@@ -415,7 +422,14 @@ white-space:nowrap;
<c:forEach items="${serviceList}" var="service" >
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.serviceId ne 37)&& (service.serviceId ne 149) }">
<form:option value="${service.serviceId}"><spring:message code="${service.actionCode}"/></form:option>
<c:choose>
<c:when test="${(service.serviceId eq 40) || (service.serviceId eq 152)}">
<form:option value="${service.serviceId}"><spring:message code="keywords"/> <spring:message code="${dict.itemValue}"/></form:option>
</c:when>
<c:otherwise>
<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
</c:otherwise>
</c:choose>
</c:if>
</c:forEach>
</c:forEach>