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

BaseReport增加time属性

Browse Source 
获取日志，打印部分信息
proxy菜单sql：日志菜单有控制策略改为proxy下
header中增加edge的ip显示下划线问题
This commit is contained in:
DuanDongmei
2018-12-07 17:29:30 +08:00
parent f93b86708d
commit 6fe2167f58
14 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/domain/report/BaseReport.java
View File

@@ -28,6 +28,7 @@ public class BaseReport<T> extends BaseEntity<T>{
protected Long sum;
protected Integer service;
protected String reportTime;
protected String time;
/**
* sum
* @return sum
@@ -70,4 +71,10 @@ public class BaseReport<T> extends BaseEntity<T>{
public void setReportTime(String reportTime) {
this.reportTime = reportTime;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
}

6
src/main/java/com/nis/util/httpclient/HttpClientUtil.java
View File

@@ -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);

1
src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
View File

@@ -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<NtcBGPLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcBGPLog>>(){}.getType());

1
src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
View File

@@ -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();

1
src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java
View File

@@ -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();

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

@@ -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();

2
src/main/java/com/nis/web/controller/log/ntc/IpLogController.java
View File

@@ -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<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.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();

2
src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java
View File

@@ -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<IrDnatLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<IrDnatLog>>(){}.getType());

1
src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java
View File

@@ -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<IrSnatLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<IrSnatLog>>(){}.getType());

1
src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
View File

@@ -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<NtcMailLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcMailLog>>(){}.getType());

4
src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
View File

@@ -98,7 +98,9 @@ public class MmPornAvSampleController extends BaseController {
if (fromJson.getStatus().intValue() == 200) {
Page<MmAvIpLog> 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<MmAvIpLog> list = page.getList();
for (MmAvIpLog l : list) {
l.setFunctionId(entry.getFunctionId());

1
src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
View File

@@ -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();

11
src/main/resources/sql/20181207/update_sys_menu_data.sql Normal file
View File

@@ -0,0 +1,11 @@
UPDATE `sys_menu` SET `id`='959', `parent_id`='951', `parent_ids`='0,1,152,951,', `code`='http_block', `name`='HTTP<EFBFBD>ܿ<EFBFBD>', `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<EFBFBD>ض<EFBFBD><EFBFBD><EFBFBD>', `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<EFBFBD>滻', `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<EFBFBD><EFBFBD><EFBFBD><EFBFBD>', `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`='<EFBFBD><EFBFBD><EFBFBD>Ʋ<EFBFBD><EFBFBD><EFBFBD>', `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`='<EFBFBD><EFBFBD><EFBFBD>Ʋ<EFBFBD><EFBFBD><EFBFBD>', `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<EFBFBD>ܿ<EFBFBD>', `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<EFBFBD>ض<EFBFBD><EFBFBD><EFBFBD>', `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<EFBFBD>滻', `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<EFBFBD><EFBFBD><EFBFBD><EFBFBD>', `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');

1
src/main/webapp/WEB-INF/include/header.jsp
View File

@@ -4,6 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="renderer" content="webkit"><meta http-equiv="X-UA-Compatible" content="IE=8,IE=9,IE=10" />
<meta http-equiv="Expires" content="0"><meta http-equiv="Cache-Control" content="no-cache"><meta http-equiv="Cache-Control" content="no-store">
<meta name="format-detection" content="telephone=no,email=no,address=no">
<link href="${pageContext.request.contextPath}/static/global/plugins/font-awesome/css/font-awesome.css" rel="stylesheet" type="text/css" />