From 821132931ad1cf10d1922f4e6a20026ad0dc9d88 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 9 Oct 2018 16:36:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8D=95=E6=8D=89=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=90=8Elog=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E6=94=B9?= =?UTF-8?q?=E4=B8=BAlogger.error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/log/manipulation/DkBehaviorLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/AppLogController.java | 2 +- .../com/nis/web/controller/log/ntc/DdosLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/FtpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/IpsecLogController.java | 2 +- .../com/nis/web/controller/log/ntc/L2tpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmAvIpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmAvUrlLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmPicIpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmPicUrlController.java | 2 +- .../nis/web/controller/log/ntc/MmPornAvSampleController.java | 4 ++-- .../nis/web/controller/log/ntc/MmSampleAudioController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleFaceController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleLogoController.java | 2 +- .../com/nis/web/controller/log/ntc/MmSamplePicController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleSpeakerController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleVideoController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleVoipLogController.java | 2 +- .../web/controller/log/ntc/MmVoipAccountLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmVoipIpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmVoipLogController.java | 2 +- .../com/nis/web/controller/log/ntc/OpenVpnLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/P2pLogController.java | 2 +- .../com/nis/web/controller/log/ntc/PptpLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/SshLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/SslLogController.java | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java index 5e1ca4dc4..af57149ac 100644 --- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java +++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java @@ -95,7 +95,7 @@ public class DkBehaviorLogController extends BaseController{ logger.info("查询行为识别日志成功"); } } catch (Exception e) { - logger.info("查询行为识别日志失败", e); + logger.error("查询行为识别日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/manipulation/dkBehaviorList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java b/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java index 5b6868afd..8d86aeb92 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java @@ -76,7 +76,7 @@ public class AppLogController extends BaseController{ logger.info("查询App日志成功"); } } catch (Exception e) { - logger.info("查询App日志失败", e); + logger.error("查询App日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/appList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java index 215869857..65eeb3f7a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java @@ -91,7 +91,7 @@ public class DdosLogController extends BaseController{ logger.info("查询Ddos日志成功"); } } catch (Exception e) { - logger.info("查询Ddos日志失败", e); + logger.error("查询Ddos日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/ddosList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java index aece04557..6abd9c11f 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java @@ -78,7 +78,7 @@ public class FtpLogController extends BaseController{ logger.info("查询Ftp日志成功"); } } catch (Exception e) { - logger.info("查询Ftp日志失败", e); + logger.error("查询Ftp日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/ftpList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java index 6062f4cde..04ccf1512 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java @@ -76,7 +76,7 @@ public class IpsecLogController extends BaseController{ logger.info("查询Ipsec日志成功"); } } catch (Exception e) { - logger.info("查询Ipsec日志失败", e); + logger.error("查询Ipsec日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/ipsecList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java index 5173fc4f4..d93356c1a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java @@ -62,7 +62,7 @@ public class L2tpLogController extends BaseController { model.addAttribute("page", page); } } catch (Exception e) { - logger.info("L2TP日志查询失败", e); + logger.error("L2TP日志查询失败", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java index 31f09221c..8340a38fb 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java @@ -76,7 +76,7 @@ public class MmAvIpLogController extends BaseController{ logger.info("查询音视频IP日志成功"); } } catch (Exception e) { - logger.info("查询音视频IP日志失败", e); + logger.error("查询音视频IP日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmAvIpList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java index d4ac8011f..80f30463d 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java @@ -76,7 +76,7 @@ public class MmAvUrlLogController extends BaseController{ logger.info("查询音视频url日志成功"); } } catch (Exception e) { - logger.info("查询音视频url日志失败", e); + logger.error("查询音视频url日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmAvUrlList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java index 48316189b..d9a05491e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java @@ -61,7 +61,7 @@ public class MmPicIpLogController extends BaseController { logger.info("音视频图片IP日志查询成功！"); } } catch (Exception e) { - logger.info("音视频图片IP日志查询失败！", e); + logger.error("音视频图片IP日志查询失败！", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java index 03520430e..4360e12d5 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java @@ -61,7 +61,7 @@ public class MmPicUrlController extends BaseController{ logger.info("音视频图片URL日志查询成功！"); } } catch (Exception e) { - logger.info("音视频图片URL日志查询失败！", e); + logger.error("音视频图片URL日志查询失败！", e); addMessageLog(model, e.getMessage()); } 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 78aa4ea7d..94691404a 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 @@ -63,7 +63,7 @@ public class MmPornAvSampleController extends BaseController { logger.info("查询音频色情样例日志成功"); } } catch (Exception e) { - logger.info("查询音频色情样例日志失败", e); + logger.error("查询音频色情样例日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmPornAudioSampleList"; @@ -104,7 +104,7 @@ public class MmPornAvSampleController extends BaseController { logger.info("查询视频色情样例日志成功"); } } catch (Exception e) { - logger.info("查询视频色情样例日志失败", e); + logger.error("查询视频色情样例日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmPornVideoSampleList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java index b05a2ef81..2db7f11a4 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java @@ -61,7 +61,7 @@ public class MmSampleAudioController extends BaseController{ logger.info("音频样例日志查询成功！"); } } catch (Exception e) { - logger.info("音频样例日志查询失败！", e); + logger.error("音频样例日志查询失败！", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java index 3a399ecb9..1095da20c 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java @@ -61,7 +61,7 @@ public class MmSampleFaceController extends BaseController{ logger.info("人脸识别日志查询成功！"); } } catch (Exception e) { - logger.info("人脸识别日志查询失败！", e); + logger.error("人脸识别日志查询失败！", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java index 0d4b26f08..8b8dcf3a0 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java @@ -61,7 +61,7 @@ public class MmSampleLogoController extends BaseController{ logger.info("台标识别日志查询成功！"); } } catch (Exception e) { - logger.info("台标识别日志查询失败！", e); + logger.error("台标识别日志查询失败！", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java index 88c5db172..9ea88dfef 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java @@ -61,7 +61,7 @@ public class MmSamplePicController extends BaseController{ logger.info("图片样例日志查询成功！"); } } catch (Exception e) { - logger.info("图片样例日志查询失败！", e); + logger.error("图片样例日志查询失败！", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java index b53fb7c78..6ba4a1af5 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java @@ -61,7 +61,7 @@ public class MmSampleSpeakerController extends BaseController{ logger.info("说话人识别日志查询成功！"); } } catch (Exception e) { - logger.info("说话人识别日志查询失败！", e); + logger.error("说话人识别日志查询失败！", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java index 5257af016..f671733c3 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java @@ -61,7 +61,7 @@ public class MmSampleVideoController extends BaseController{ logger.info("视频样例日志查询成功！"); } } catch (Exception e) { - logger.info("视频样例日志查询失败！", e); + logger.error("视频样例日志查询失败！", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java index c62b5809c..f5ecf8c56 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java @@ -68,7 +68,7 @@ public class MmSampleVoipLogController extends BaseController { logger.info("查询Voip样例日志成功"); } } catch (Exception e) { - logger.info("查询Voip日志失败", e); + logger.error("查询Voip日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmSampleVoipList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java index 0e097e2d8..62f29d105 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java @@ -75,7 +75,7 @@ public class MmVoipAccountLogController extends BaseController{ logger.info("查询mmVoipAccount日志成功"); } } catch (Exception e) { - logger.info("查询mmVoipAccount日志失败", e); + logger.error("查询mmVoipAccount日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmVoipAccountList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java index 6aaad7f08..d158b243d 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java @@ -75,7 +75,7 @@ public class MmVoipIpLogController extends BaseController{ logger.info("查询VoipIp日志成功"); } } catch (Exception e) { - logger.info("查询VoipIp日志失败", e); + logger.error("查询VoipIp日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmVoipIpList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java index 68b0351b3..6a137d576 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java @@ -75,7 +75,7 @@ public class MmVoipLogController extends BaseController{ logger.info("查询Voip日志成功"); } } catch (Exception e) { - logger.info("查询Voip日志失败", e); + logger.error("查询Voip日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/mmVoipList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java index 805a49285..439796879 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java @@ -77,7 +77,7 @@ public class OpenVpnLogController extends BaseController{ logger.info("查询OpenVpn日志成功"); } } catch (Exception e) { - logger.info("查询OpenVpn日志失败", e); + logger.error("查询OpenVpn日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/openVpnList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java index c4efc33f9..c1f255789 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java @@ -42,7 +42,7 @@ public class P2pLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_P2P_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); + logger.error("查询结果:" + 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/PptpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java index cdc659651..d67398d9f 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java @@ -62,7 +62,7 @@ public class PptpLogController extends BaseController { model.addAttribute("page", page); } } catch (Exception e) { - logger.info("PPTP日志查询失败", e); + logger.error("PPTP日志查询失败", e); addMessageLog(model, e.getMessage()); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java index 8f2583de0..96eda247a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java @@ -77,7 +77,7 @@ public class SshLogController extends BaseController{ logger.info("查询Ssh日志成功"); } } catch (Exception e) { - logger.info("查询Ssh日志失败", e); + logger.error("查询Ssh日志失败", e); addMessageLog(model, e.getMessage()); } return "/log/ntc/sshList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java index 9ab408e0d..a5f55f8b7 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java @@ -66,7 +66,7 @@ public class SslLogController extends BaseController { model.addAttribute("page", page); } } catch (Exception e) { - logger.info("SSL日志查询失败", e); + logger.error("SSL日志查询失败", e); addMessageLog(model, e.getMessage()); } From 5042d6e99b09cab967dcbaec1d644af227659703 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 9 Oct 2018 18:14:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?(1)=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=20(2)BGP=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5type,as=20route?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/log/MmFileDigestLog.java | 70 ++++ .../java/com/nis/domain/log/NtcBGPLog.java | 28 ++ .../java/com/nis/domain/log/NtcIpLog.java | 1 - src/main/java/com/nis/util/Constants.java | 1 + .../controller/log/ntc/BgpLogController.java | 19 +- .../log/ntc/MmFileDigestLogController.java | 85 +++++ .../resources/messages/message_en.properties | 5 +- .../resources/messages/message_ru.properties | 3 + .../messages/message_zh_CN.properties | 3 + src/main/resources/nis.properties | 9 +- .../webapp/WEB-INF/views/log/ntc/bgpList.jsp | 7 +- .../views/log/ntc/mmFileDigestList.jsp | 304 ++++++++++++++++++ 12 files changed, 515 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/nis/domain/log/MmFileDigestLog.java create mode 100644 src/main/java/com/nis/domain/log/NtcBGPLog.java create mode 100644 src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java create mode 100644 src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp diff --git a/src/main/java/com/nis/domain/log/MmFileDigestLog.java b/src/main/java/com/nis/domain/log/MmFileDigestLog.java new file mode 100644 index 000000000..e9c896b73 --- /dev/null +++ b/src/main/java/com/nis/domain/log/MmFileDigestLog.java @@ -0,0 +1,70 @@ +package com.nis.domain.log; + +import com.wordnik.swagger.annotations.ApiModelProperty; + +/** + * @ClassName:MmFileDigestLog + * @author (wx) + * @date 2018年7月16日 下午2:54:23 + * @version V1.0 + */ +public class MmFileDigestLog extends BaseLogEntity { + + private static final long serialVersionUID = -6177790560553329386L; + @ApiModelProperty(value="节目ID", required=true) + protected String pid; + @ApiModelProperty(value="节目访问地址", required=true) + protected String url; + @ApiModelProperty(value="封堵现场片段路径", required=true) + protected String logUri; + @ApiModelProperty(value="入口页面", required=true) + protected String referer; + @ApiModelProperty(value="有害级别", required=true) + protected Integer level; + @ApiModelProperty(value="封堵类型", required=true) + protected Integer fdType; + @ApiModelProperty(value="协议", required=true) + protected String protocol; + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getLogUri() { + return logUri; + } + public void setLogUri(String logUri) { + this.logUri = logUri; + } + public String getReferer() { + return referer; + } + public void setReferer(String referer) { + this.referer = referer; + } + public Integer getLevel() { + return level; + } + public void setLevel(Integer level) { + this.level = level; + } + public Integer getFdType() { + return fdType; + } + public void setFdType(Integer fdType) { + this.fdType = fdType; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } +} diff --git a/src/main/java/com/nis/domain/log/NtcBGPLog.java b/src/main/java/com/nis/domain/log/NtcBGPLog.java new file mode 100644 index 000000000..785d76219 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcBGPLog.java @@ -0,0 +1,28 @@ +package com.nis.domain.log; + +public class NtcBGPLog extends BaseLogEntity { + + private static final long serialVersionUID = 4597407682545926823L; + private Integer type; + private String as; + private String route; + public Integer getType() { + return type; + } + public void setType(Integer type) { + this.type = type; + } + public String getAs() { + return as; + } + public void setAs(String as) { + this.as = as; + } + public String getRoute() { + return route; + } + public void setRoute(String route) { + this.route = route; + } + +} diff --git a/src/main/java/com/nis/domain/log/NtcIpLog.java b/src/main/java/com/nis/domain/log/NtcIpLog.java index a3eb3bfde..c8d5b8983 100644 --- a/src/main/java/com/nis/domain/log/NtcIpLog.java +++ b/src/main/java/com/nis/domain/log/NtcIpLog.java @@ -3,5 +3,4 @@ package com.nis.domain.log; public class NtcIpLog extends BaseLogEntity { private static final long serialVersionUID = 4597407682545926823L; - } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index b4cb584ec..0ed1cbe7d 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -415,6 +415,7 @@ public final class Constants { public static final String NTC_MMVOIP_LOG = Configurations.getStringProperty("mmVoipLog", ""); public static final String NTC_MMSAMPLE_VOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", ""); public static final String NTC_MMAVIP_LOG = Configurations.getStringProperty("mmAvIpLog", ""); + public static final String NTC_MMFILEDIGEST_LOG = Configurations.getStringProperty("mmFileDigestLog", ""); public static final String NTC_MMPORNAUDIOSAMPLE_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", ""); public static final String NTC_MMPORNVIDEOSAMPLE_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", ""); public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", ""); 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 0fb1daed2..b34fbab6e 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 @@ -1,7 +1,5 @@ package com.nis.web.controller.log.ntc; -import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -10,23 +8,18 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.aspectj.util.FileUtil; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; -import com.nis.domain.Page; import com.nis.domain.PageLog; -import com.nis.domain.log.NtcIpLog; +import com.nis.domain.log.NtcBGPLog; import com.nis.domain.maat.LogRecvData; -import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.httpclient.HttpClientUtil; @@ -37,9 +30,9 @@ import com.nis.web.controller.BaseController; public class BgpLogController extends BaseController { @RequestMapping(value = {"list", ""}) - public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) { + public String list(@ModelAttribute("log") NtcBGPLog log, Model model, HttpServletRequest request, HttpServletResponse response) { try { - PageLog page = new PageLog(request, response); + PageLog page = new PageLog(request, response); Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); @@ -55,11 +48,11 @@ public class BgpLogController extends BaseController { logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); - LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { page.setList(fromJson.getData().getList()); - List list = page.getList(); - for (NtcIpLog l : list) { + List list = page.getList(); + for (NtcBGPLog l : list) { l.setFunctionId(log.getFunctionId()); setLogAction(l,serviceList); } diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java new file mode 100644 index 000000000..8f0152036 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java @@ -0,0 +1,85 @@ +package com.nis.web.controller.log.ntc; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.http.client.ClientProtocolException; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.FunctionServiceDict; +import com.nis.domain.Page; +import com.nis.domain.PageLog; +import com.nis.domain.log.MmFileDigestLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.DictUtils; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmFileDigestLogs") +public class MmFileDigestLogController extends BaseController{ + + /** + * 音视频url日志 + * @param model + * @param entry + * @param request + * @param response + * @return + * @throws ClientProtocolException + * @throws IOException + */ + @RequestMapping(value={"list",""}) + public String list(Model model,@ModelAttribute("log")MmFileDigestLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { + + try { + + PageLog page = new PageLog(request, response); + Map params=new HashMap<>(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + //查询值判断 + initLogSearchValue(entry,params); + + List serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); + model.addAttribute("serviceList", serviceList); + + String url = ""; + url = Constants.LOG_BASE_URL+Constants.NTC_MMFILEDIGEST_LOG; + String jsonString = HttpClientUtil.getMsg(url,params,request); + + Gson gson = new GsonBuilder().create(); + //gson泛型支持 + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + + if (fromJson.getStatus().intValue() == 200) { + Page data = fromJson.getData(); + page.setList(data.getList()); + List list = page.getList(); + for (MmFileDigestLog l : list) { + l.setFunctionId(entry.getFunctionId()); + setLogAction(l,serviceList); + } + model.addAttribute("page", page); + logger.info("查询文件摘要日志成功"); + } + } catch (Exception e) { + logger.error("查询文件摘要日志失败", e); + addMessageLog(model, e.getMessage()); + } + return "/log/ntc/mmFileDigestList"; + } + +} diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 6138724c4..0f9cc8897 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1196,4 +1196,7 @@ snat_ip_complex_loop=SNAT Complex Loop snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop snat_policy=SNAT Reuse Policy -dnat_policy=DNAT Reuse Policy \ No newline at end of file +dnat_policy=DNAT Reuse Policy +message_type=Message Type +as=AS +route=Route \ 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 9b12d3b99..362b49b43 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1197,3 +1197,6 @@ dnat_ip_complex_loop=DNAT Complex Loop snat_ip_complex_loop=SNAT Complex Loop snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop +message_type=\u6D88\u606F\u7C7B\u578B +as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 +route=\u8DEF\u7531\u4FE1\u606F \ 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 5a1669eb9..f4d0a485c 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1191,3 +1191,6 @@ dnat_complex_loop=DNAT IP\u590D\u7528\u56DE\u6D41 ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41 snat_policy=SNAT\u590D\u7528\u7B56\u7565 dnat_policy=DNAT\u590D\u7528\u7B56\u7565 +message_type=\u6D88\u606F\u7C7B\u578B +as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 +route=\u8DEF\u7531\u4FE1\u606F \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 5c40f348d..734a94d30 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,14 +219,14 @@ clusterBStartTime=1503504000725 isCommit=true ############################################################################################################################################ ############################################################################################################################################ -httpUrl=http://10.0.6.242:8080/galaxy/service/cfg/v1/ +httpUrl=http://192.168.10.204:7777/galaxy/service/cfg/v1/ maatCfg=configSources fileUploadCfg=fileUploadSources callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ -logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ +logBaseUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ ntcPzReport=ntcPzReport ntcServiceReport=ntcServiceReport ntcTagReport=ntcTagReport @@ -270,7 +270,7 @@ mmLogoDetectionLog=mmLogoDetectionLogs mmFaceRecognizationLog=mmFaceRecognizationLogs ######################################## #\u5927\u5C4F\u56FE\u8868\u5C55\u793A\u670D\u52A1\u63A5\u53E3 -dashboardUrl=http://10.0.6.101:8080/galaxy/service/log/v1/ +dashboardUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ trafficIpActive=trafficIpActive trafficProtocol=trafficProtocol trafficApp=trafficApp @@ -523,4 +523,5 @@ log_time_range=3600000 log_time_start=2018-08-01 00:00:00 log_time_end=2018-10-01 00:00:00 area_tag=location -isp_tag=isp \ No newline at end of file +isp_tag=isp +mmFileDigestLog=mmFileDigestLogs \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 3a08da89e..9836888c7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -189,6 +189,9 @@ + + + @@ -245,7 +248,9 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.sceneFile} + ${log.type} + ${log.as} + ${log.route} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp new file mode 100644 index 000000000..b8f5cf02e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -0,0 +1,304 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ +

+ +

+
+
+
+
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ + <%--
+
+ + + + + + + +
+
--%> +
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ + +
+
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + +<%-- --%> +<%-- --%> + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + +
${log.cfgId } + + + + + + ${log.foundTime} + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + + + ${log.referer} + ${log.level} + + + + ${log.protocol}${fns:abbr(log.capIp, 42)}${log.transProto} + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort}${log.deviceId} + + + + + + + + + ${log.addrList} + ${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+
${page}
+
+
+
+
+
+ + From 608a74eace0abe813b4ea3fa2e2ecdc0c4d0d5a4 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Wed, 10 Oct 2018 13:57:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 8 ++++++-- src/main/resources/messages/message_ru.properties | 6 ++++++ src/main/resources/messages/message_zh_CN.properties | 4 ++++ src/main/resources/nis.properties | 9 +++++---- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 7019bc4d1..932c8a8bb 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -49,7 +49,7 @@ Request_from=Letter Office classification_manage=Classification area_manage=Area feature_scope_manage=Feature Scope -special_tasks=Special Task +special_tasks=Task label_manage=Custom Tag protect_list=Protect List effect_range=Effective Range @@ -1196,4 +1196,8 @@ snat_ip_complex_loop=SNAT Complex Loop snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop snat_policy=SNAT Reuse Policy -dnat_policy=DNAT Reuse Policy \ No newline at end of file +dnat_policy=DNAT Reuse Policy +report_total=Total +message_type=Message Type +as=AS +route=Route \ 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 9b12d3b99..eeba48c6b 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1197,3 +1197,9 @@ dnat_ip_complex_loop=DNAT Complex Loop snat_ip_complex_loop=SNAT Complex Loop snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop +snat_policy=SNAT Reuse Policy +dnat_policy=DNAT Reuse Policy +report_total=Total +message_type=\u6D88\u606F\u7C7B\u578B +as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 +route=\u8DEF\u7531\u4FE1\u606F \ 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 5a1669eb9..bed04829f 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1191,3 +1191,7 @@ dnat_complex_loop=DNAT IP\u590D\u7528\u56DE\u6D41 ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41 snat_policy=SNAT\u590D\u7528\u7B56\u7565 dnat_policy=DNAT\u590D\u7528\u7B56\u7565 +report_total=\u5408\u8BA1 +message_type=\u6D88\u606F\u7C7B\u578B +as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 +route=\u8DEF\u7531\u4FE1\u606F \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 5c40f348d..734a94d30 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,14 +219,14 @@ clusterBStartTime=1503504000725 isCommit=true ############################################################################################################################################ ############################################################################################################################################ -httpUrl=http://10.0.6.242:8080/galaxy/service/cfg/v1/ +httpUrl=http://192.168.10.204:7777/galaxy/service/cfg/v1/ maatCfg=configSources fileUploadCfg=fileUploadSources callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ -logBaseUrl=http://10.0.6.242:8080/galaxy/service/log/v1/ +logBaseUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ ntcPzReport=ntcPzReport ntcServiceReport=ntcServiceReport ntcTagReport=ntcTagReport @@ -270,7 +270,7 @@ mmLogoDetectionLog=mmLogoDetectionLogs mmFaceRecognizationLog=mmFaceRecognizationLogs ######################################## #\u5927\u5C4F\u56FE\u8868\u5C55\u793A\u670D\u52A1\u63A5\u53E3 -dashboardUrl=http://10.0.6.101:8080/galaxy/service/log/v1/ +dashboardUrl=http://192.168.10.204:7777/galaxy/service/log/v1/ trafficIpActive=trafficIpActive trafficProtocol=trafficProtocol trafficApp=trafficApp @@ -523,4 +523,5 @@ log_time_range=3600000 log_time_start=2018-08-01 00:00:00 log_time_end=2018-10-01 00:00:00 area_tag=location -isp_tag=isp \ No newline at end of file +isp_tag=isp +mmFileDigestLog=mmFileDigestLogs \ No newline at end of file From 1f93df146cdcd0813c087daf825ef2cc19ebb9a7 Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 10 Oct 2018 15:08:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93keywords=E9=95=BF=E5=BA=A62048?= =?UTF-8?q?=EF=BC=8Ccfg=5Fdesc=E9=95=BF=E5=BA=A6128=EF=BC=8Cdistrict?= =?UTF-8?q?=E9=95=BF=E5=BA=A6128=202.=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0=E9=95=BF=E5=BA=A6=E9=99=90?= =?UTF-8?q?=E5=88=B6=203.=E5=85=B3=E9=94=AE=E5=AD=97=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6=204.=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9D=A5=E5=87=BD=E5=88=97=E8=A1=A8=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E7=9C=81=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/20181010/updateKeywords-district.sql | 10 ++++++++++ src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp | 6 +++--- src/main/webapp/WEB-INF/views/report/lwhh.jsp | 2 +- src/main/webapp/static/global/scripts/common.js | 3 ++- 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/sql/20181010/updateKeywords-district.sql diff --git a/src/main/resources/sql/20181010/updateKeywords-district.sql b/src/main/resources/sql/20181010/updateKeywords-district.sql new file mode 100644 index 000000000..4f402d0f4 --- /dev/null +++ b/src/main/resources/sql/20181010/updateKeywords-district.sql @@ -0,0 +1,10 @@ +ALTER TABLE ssl_keyword_cfg MODIFY cfg_keywords VARCHAR(2048),MODIFY district varchar(128); +ALTER TABLE app_ssl_cert_cfg MODIFY cfg_keywords VARCHAR(2048); +ALTER TABLE app_string_feature_cfg MODIFY cfg_keywords VARCHAR(2048); +ALTER TABLE byte_features_cfg MODIFY cfg_desc VARCHAR(128); +ALTER TABLE complex_keyword_cfg MODIFY district VARCHAR(128); +ALTER TABLE dns_domain_cfg MODIFY district VARCHAR(128); +ALTER TABLE http_req_head_cfg MODIFY district VARCHAR(128); +ALTER TABLE http_res_head_cfg MODIFY district VARCHAR(128); +ALTER TABLE intercept_pkt_bin MODIFY district VARCHAR(128); +ALTER TABLE mail_keyword_cfg MODIFY district VARCHAR(128),MODIFY cfg_keywords VARCHAR(2048); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp index f9b46e586..ec84cb3e6 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp @@ -28,13 +28,13 @@
- +
- +
@@ -47,7 +47,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/report/lwhh.jsp b/src/main/webapp/WEB-INF/views/report/lwhh.jsp index c58e6db78..d465a8313 100644 --- a/src/main/webapp/WEB-INF/views/report/lwhh.jsp +++ b/src/main/webapp/WEB-INF/views/report/lwhh.jsp @@ -17,7 +17,7 @@ trContent += ""; - trContent += "${lwhh.requestTitle}"; + trContent += "${fns:abbr(lwhh.requestTitle,32)}"; diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index a759a1330..a097c5fa0 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1,6 +1,7 @@ $(function(){ //增加描述新增时的文字长度限制 - $("form input[name='cfgDesc']").attr("maxlength","128") + $("form input[name='cfgDesc']").attr("maxlength","128"); + $("form input[name$='cfgKeywords']").attr("maxlength","2048"); //截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb $("#contentTable").not(".logTb").find("td").each(function(i){ //获取td当前对象的文本,如果长度大于25;