diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java index a1065b39f..ef260f6e4 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java @@ -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 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; diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index c69c3fadd..1d6358ddb 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 03fc80b47..88bdd2c67 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index a0589bace..20a4ca013 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index c59903a16..9a7c8372f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -94,14 +94,14 @@
- + - + +