diff --git a/src/main/java/com/nis/domain/report/BaseReport.java b/src/main/java/com/nis/domain/report/BaseReport.java index 23ddf5609..663dfb9a4 100644 --- a/src/main/java/com/nis/domain/report/BaseReport.java +++ b/src/main/java/com/nis/domain/report/BaseReport.java @@ -28,6 +28,7 @@ public class BaseReport extends BaseEntity{ protected Long sum; protected Integer service; protected String reportTime; + protected String time; /** * sum * @return sum @@ -70,4 +71,10 @@ public class BaseReport extends BaseEntity{ public void setReportTime(String reportTime) { this.reportTime = reportTime; } + public String getTime() { + return time; + } + public void setTime(String time) { + this.time = time; + } } diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index 97442a0d3..3b32487bc 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -275,7 +275,11 @@ public class HttpClientUtil { // result = EntityUtils.toString(response.getEntity()); //调用处理数据方法 result = galaxyMessageFormat(result); - logger.info("获取消息成功，相应内容如下： " + result); + if(!StringUtil.isEmpty(result) && result.length() > 501) { + logger.info("获取消息成功，相应内容如下： " + result.substring(0, 500)); + }else { + logger.info("获取消息成功，相应内容如下： " + result); + } } else { logger.error("获取消息失败，相应内容如下： " + result); diff --git a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java index 17c94fab3..d66b07bed 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java @@ -47,7 +47,6 @@ public class BgpLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_BGP_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java index f24e9e58d..697263600 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java @@ -50,7 +50,6 @@ public class DnsLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_DNS_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); Gson gson = new GsonBuilder().create(); diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java index 5af42452c..c2d35b195 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java @@ -50,7 +50,6 @@ public class HttpKeyLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_KEYWORDS_URL_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); Gson gson = new GsonBuilder().create(); 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 7af16e5ad..a1065b39f 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 @@ -49,7 +49,6 @@ public class HttpLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); Gson gson = new GsonBuilder().create(); diff --git a/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java index ba1c47f2e..0fbf42732 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java @@ -52,7 +52,6 @@ public class IpLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_IP_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); @@ -91,7 +90,6 @@ public class IpLogController extends BaseController { String url = "http://10.0.6.121:8080/gwall/test/logTest"; try { String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); Gson gson = new GsonBuilder().create(); diff --git a/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java index 54e4f73f1..918efb828 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java @@ -46,8 +46,6 @@ public class IrDnatLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.IR_DNAT_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - - logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java index d42d6c4ed..fd4f901b8 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java @@ -47,7 +47,6 @@ public class IrSnatLogController extends BaseController { String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java index 729c61f40..e3fd62ddf 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java @@ -47,7 +47,6 @@ public class MailLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_MAIL_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java index d6a09dc71..7c658066c 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java @@ -98,7 +98,9 @@ public class MmPornAvSampleController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setList(data.getList()); + page.setLast(data.getLast()); List list = page.getList(); for (MmAvIpLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java index 4477c79d3..e44dc874b 100644 --- a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java @@ -50,7 +50,6 @@ public class PxyHttpLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.PXY_HTTP_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); Gson gson = new GsonBuilder().create(); diff --git a/src/main/resources/sql/20181207/update_sys_menu_data.sql b/src/main/resources/sql/20181207/update_sys_menu_data.sql new file mode 100644 index 000000000..62e96d658 --- /dev/null +++ b/src/main/resources/sql/20181207/update_sys_menu_data.sql @@ -0,0 +1,11 @@ +UPDATE `sys_menu` SET `id`='959', `parent_id`='951', `parent_ids`='0,1,152,951,', `code`='http_block', `name`='HTTPܿ', `sort`='2', `href`='/log/pxy/httpBlocklogs', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 10:16:26', `update_by`='1', `update_date`='2018-08-01 10:16:26', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='207' WHERE (`id`='959'); +UPDATE `sys_menu` SET `id`='960', `parent_id`='951', `parent_ids`='0,1,152,951,', `code`='http_redirect', `name`='HTTPض', `sort`='3', `href`='/log/pxy/httpRedirectlogs', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 10:17:41', `update_by`='1', `update_date`='2018-08-01 10:17:41', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='208' WHERE (`id`='960'); +UPDATE `sys_menu` SET `id`='962', `parent_id`='951', `parent_ids`='0,1,152,951,', `code`='http_replace', `name`='HTTP滻', `sort`='4', `href`='/log/pxy/httpReplacelogs', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 10:18:38', `update_by`='1', `update_date`='2018-08-01 10:18:38', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='209' WHERE (`id`='962'); +UPDATE `sys_menu` SET `id`='963', `parent_id`='951', `parent_ids`='0,1,152,951,', `code`='http_monit', `name`='HTTP', `sort`='1', `href`='/log/pxy/httpMonitogs', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 10:19:48', `update_by`='1', `update_date`='2018-08-01 10:19:48', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='210' WHERE (`id`='963'); +UPDATE `sys_menu` SET `id`='953', `parent_id`='951', `parent_ids`='0,1,152,951,', `code`='control_policy', `name`='Ʋ', `sort`='60', `href`='', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 10:04:12', `update_by`='1', `update_date`='2018-08-01 10:04:12', `remarks`='', `del_flag`='0', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`=NULL WHERE (`id`='953'); +UPDATE `sys_menu` SET `id`='958', `parent_id`='956', `parent_ids`='0,1,780,956,', `code`='control_policy', `name`='Ʋ', `sort`='60', `href`='', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 10:12:32', `update_by`='1', `update_date`='2018-08-01 10:12:32', `remarks`='', `del_flag`='0', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`=NULL WHERE (`id`='958'); +UPDATE `sys_menu` SET `id`='979', `parent_id`='956', `parent_ids`='0,1,780,956,', `code`='http_block', `name`='HTTPܿ', `sort`='2', `href`='/report/list?cfgName=http_block', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 16:45:56', `update_by`='1', `update_date`='2018-08-01 16:45:56', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='207' WHERE (`id`='979'); +UPDATE `sys_menu` SET `id`='980', `parent_id`='956', `parent_ids`='0,1,780,956,', `code`='http_redirect', `name`='HTTPض', `sort`='3', `href`='/report/list?cfgName=http_redirect', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 16:47:32', `update_by`='1', `update_date`='2018-08-01 16:47:32', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='208' WHERE (`id`='980'); +UPDATE `sys_menu` SET `id`='981', `parent_id`='956', `parent_ids`='0,1,780,956,', `code`='http_replace', `name`='HTTP滻', `sort`='4', `href`='/report/list?cfgName=http_replace', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 16:48:40', `update_by`='1', `update_date`='2018-08-01 16:48:40', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='209' WHERE (`id`='981'); +UPDATE `sys_menu` SET `id`='982', `parent_id`='956', `parent_ids`='0,1,780,956,', `code`='http_monit', `name`='HTTP', `sort`='1', `href`='/report/list?cfgName=http_monit', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-08-01 16:49:33', `update_by`='1', `update_date`='2018-08-01 16:49:33', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='210' WHERE (`id`='982'); + diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index f27cd384a..a8ab5071c 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -4,6 +4,7 @@ +