From 21cd6c06be5774057934beaebbb92c87e5d0ac94 Mon Sep 17 00:00:00 2001 From: shangguanyanfei Date: Mon, 10 Jun 2019 16:22:03 +0800 Subject: [PATCH] =?UTF-8?q?HTTP(S)=E6=93=8D=E6=8E=A7=E6=97=A5=E5=BF=97app?= =?UTF-8?q?=5Fid,app=5Fprotocol,protocol=5Fid=E7=9B=B4=E6=8E=A5=E5=8F=96?= =?UTF-8?q?=E5=80=BC=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=AD=97=E5=85=B8=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=20=20=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8-=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6=E4=BB=A3=E7=90=86=E7=BB=9F=E8=AE=A1=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=8F=8A=E5=AE=83=E4=B8=8B=E9=9D=A2=E7=9A=84=E5=AD=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=83=BD=E7=BD=AE=E4=B8=BA=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/log/PxyHttpManipulationLog.java | 8 +-- .../log/pxy/PxyHttpManipulLogController.java | 68 +++++++++---------- .../sql/20190610/update_sys_menu.sql | 9 ++- .../views/log/pxy/pxyHttpManipulationList.jsp | 62 +++++++++-------- 4 files changed, 78 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/nis/domain/log/PxyHttpManipulationLog.java b/src/main/java/com/nis/domain/log/PxyHttpManipulationLog.java index 7f8275737..865b08dbe 100644 --- a/src/main/java/com/nis/domain/log/PxyHttpManipulationLog.java +++ b/src/main/java/com/nis/domain/log/PxyHttpManipulationLog.java @@ -137,13 +137,13 @@ public class PxyHttpManipulationLog extends BaseEntity{ protected String san; @ExcelField(title="cn",sort=85) protected String cn; -// @ExcelField(title="social_app",sort=86) - protected String appId;//app @ExcelField(title="social_app",sort=86) + protected String appId;//app +// @ExcelField(title="social_app",sort=86) protected String appName;//app -// @ExcelField(title="protocol",sort=87) - protected String protocolId;//协议 @ExcelField(title="protocol",sort=87) + protected String protocolId;//协议 +// @ExcelField(title="protocol",sort=87) protected String protocolName;//协议 @ExcelField(title="con_latency_ms",sort=88) protected Integer conLatencyMs;//握手延迟 diff --git a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java index e03671e6f..7b9a9a83d 100644 --- a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java +++ b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpManipulLogController.java @@ -53,8 +53,8 @@ public class PxyHttpManipulLogController extends BaseController{ public String list(@ModelAttribute("log") PxyHttpManipulationLog log, Model model, HttpServletRequest request, HttpServletResponse response,Integer searchAction) { try { - List protocolCodeList = CodeDicUtils.getCodeList("protocolCode"); - List appCodeList = CodeDicUtils.getCodeList("appCode"); +// List protocolCodeList = CodeDicUtils.getCodeList("protocolCode"); +// List appCodeList = CodeDicUtils.getCodeList("appCode"); PageLog page = new PageLog(request, response); Map params = new HashMap(); params.put("pageSize", page.getPageSize()); @@ -79,18 +79,18 @@ public class PxyHttpManipulLogController extends BaseController{ if(log.getCfgId()!=null && log.getPolicyId() ==null){ log.setPolicyId(log.getCfgId()); } - if (StringUtils.isNotBlank(log.getAppId())) { - params.put("searchAppId", log.getAppId()); - } - if (StringUtils.isNotBlank(log.getProtocolId())) { - params.put("searchProtocolId", log.getProtocolId()); - } +// if (StringUtils.isNotBlank(log.getAppId())) { +// params.put("searchAppId", log.getAppId()); +// } +// if (StringUtils.isNotBlank(log.getProtocolId())) { +// params.put("searchProtocolId", log.getProtocolId()); +// } initLogSearchValues(log, params); List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); model.addAttribute("serviceList", serviceList); - model.addAttribute("appList", appCodeList); - model.addAttribute("protocolList", protocolCodeList); +// model.addAttribute("appList", appCodeList); +// model.addAttribute("protocolList", protocolCodeList); String url = Constants.LOG_BASE_URL + Constants.POLICY_EVENT; String recv = HttpClientUtil.getMsg(url, params, request); @@ -111,7 +111,7 @@ public class PxyHttpManipulLogController extends BaseController{ l.setStartTime(timeStamp2Date(l.getStartTime(),null)); l.setEndTime(timeStamp2Date(l.getEndTime(),null)); l.setRecvTime(timeStamp2Date(l.getRecvTime(),null)); - for (CodeResult code : appCodeList) { + /*for (CodeResult code : appCodeList) { Integer value3 = Integer.valueOf(code.getCode()); if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){ l.setAppName(code.getItem()); @@ -124,7 +124,7 @@ public class PxyHttpManipulLogController extends BaseController{ l.setProtocolName(code.getItem()); break; } - } + }*/ } } @@ -148,8 +148,8 @@ public class PxyHttpManipulLogController extends BaseController{ Map dataMap = new HashMap(); Map noExportMap = new HashMap(); // --------------------------- - List protocolCodeList = CodeDicUtils.getCodeList("protocolCode"); - List appCodeList = CodeDicUtils.getCodeList("appCode"); +// List protocolCodeList = CodeDicUtils.getCodeList("protocolCode"); +// List appCodeList = CodeDicUtils.getCodeList("appCode"); PageLog page = new PageLog(request, response); page.setPageNo(1); page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE); @@ -171,12 +171,12 @@ public class PxyHttpManipulLogController extends BaseController{ String domain = StringEscapeUtils.unescapeHtml(log.getDomain()); params.put("searchDomain", domain); } - if (StringUtils.isNotBlank(log.getAppId())) { - params.put("searchAppId", log.getAppId()); - } - if (StringUtils.isNotBlank(log.getProtocolId())) { - params.put("searchProtocolId", log.getProtocolId()); - } +// if (StringUtils.isNotBlank(log.getAppId())) { +// params.put("searchAppId", log.getAppId()); +// } +// if (StringUtils.isNotBlank(log.getProtocolId())) { +// params.put("searchProtocolId", log.getProtocolId()); +// } List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); model.addAttribute("serviceList", serviceList); @@ -199,20 +199,20 @@ public class PxyHttpManipulLogController extends BaseController{ l.setStartTime(timeStamp2Date(l.getStartTime(),null)); l.setEndTime(timeStamp2Date(l.getEndTime(),null)); l.setRecvTime(timeStamp2Date(l.getRecvTime(),null)); - for (CodeResult code : appCodeList) { - Integer value3 = Integer.valueOf(code.getCode()); - if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){ - l.setAppName(code.getItem()); - break; - } - } - for (CodeResult code : protocolCodeList) { - Integer value3 = Integer.valueOf(code.getCode()); - if(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){ - l.setProtocolName(code.getItem()); - break; - } - } +// for (CodeResult code : appCodeList) { +// Integer value3 = Integer.valueOf(code.getCode()); +// if(StringUtils.isNotBlank(l.getAppId()) && l.getAppId().equals(code.getCode())){ +// l.setAppName(code.getItem()); +// break; +// } +// } +// for (CodeResult code : protocolCodeList) { +// Integer value3 = Integer.valueOf(code.getCode()); +// if(StringUtils.isNotBlank(l.getProtocolId()) && l.getProtocolId().equals(code.getCode())){ +// l.setProtocolName(code.getItem()); +// break; +// } +// } } String title=""; if(log.getAction().equals(1)){//监测 diff --git a/src/main/resources/sql/20190610/update_sys_menu.sql b/src/main/resources/sql/20190610/update_sys_menu.sql index c33f10f22..3cc66595c 100644 --- a/src/main/resources/sql/20190610/update_sys_menu.sql +++ b/src/main/resources/sql/20190610/update_sys_menu.sql @@ -1,4 +1,11 @@ #修改日志检索->国家代理->HTTP(S)阻断 url UPDATE `sys_menu` SET `href`='/log/pxy/httpBlockLists?searchAction=16' WHERE code='http_block' and href='/log/pxy/httpBlockList?searchAction=16' and permission= ''; #修改日志检索->国家代理->HTTP(S)监测 url -UPDATE `sys_menu` SET `href`='/log/pxy/httpMonitLists?searchAction=1' WHERE code='http_monit' and href='/log/pxy/httpMonitogs' and permission= ''; \ No newline at end of file +UPDATE `sys_menu` SET `href`='/log/pxy/httpMonitLists?searchAction=1' WHERE code='http_monit' and href='/log/pxy/httpMonitogs' and permission= ''; + +#实时报表->国家代理菜单和它下面的子菜单都置为失效 +UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_block'; +UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_redirect'; +UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_replace'; +UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_monit'; +UPDATE `sys_menu` SET `del_flag`='0' WHERE `code`='Proxy' and parent_id='780'; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp index f13e75387..46fdbd1cf 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpManipulationList.jsp @@ -21,7 +21,7 @@ .attr("value",''); $("#searchForm")[0].reset(); }); - returnBack(); +// returnBack(); //筛选功能 filterActionInit(); //异步获取voip相关信息 @@ -126,8 +126,8 @@ - - + <%-- + --%> @@ -258,7 +258,7 @@ --%> -
+ <%--
-
-
-
-
+
--%> +
@@ -282,6 +280,9 @@
+
+
+
@@ -312,14 +313,15 @@
-
-
+
+
+
@@ -349,7 +351,7 @@
--%> -
+ <%--
-
+
--%>
<%--
@@ -406,18 +408,18 @@ URL         - + - - + + - - - - - - + + + + + + <%-- --%> <%-- @@ -427,22 +429,22 @@ - + - - + + <%-- --%> - + <%-- --%> - - + + @@ -468,7 +470,7 @@ - + @@ -660,8 +662,8 @@ ${log.sni } ${log.san } ${log.cn } - ${log.appName } - ${log.protocolName } + ${log.appId } + ${log.protocolId } ${log.conLatencyMs } ${log.pinningst }