From 1f93df146cdcd0813c087daf825ef2cc19ebb9a7 Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 10 Oct 2018 15:08:04 +0800 Subject: [PATCH 1/6] =?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; From 1b3ee67f4c9b52bcb81a0120daf52b457bd791d5 Mon Sep 17 00:00:00 2001 From: leijun Date: Wed, 10 Oct 2018 15:29:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=92=8C=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E5=95=86=E7=AE=A1=E7=90=86=E7=9A=84itemcode=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8D=E7=B1=BB=E5=9E=8B=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E6=9C=89=E6=95=88=E9=85=8D=E7=BD=AE=EF=BC=8Citemcode=E4=B8=8D?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/basics/SysDictInfoController.java | 7 +++++-- .../java/com/nis/web/dao/basics/SysDictInfoDao.java | 2 +- .../java/com/nis/web/dao/basics/SysDictInfoDao.xml | 10 ++++++++-- .../com/nis/web/service/basics/SysDictInfoService.java | 4 ++-- src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index dc4ac98fd..d64e0ad20 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -234,13 +234,16 @@ public class SysDictInfoController extends BaseController { */ @ResponseBody @RequestMapping(value = "isItemCodeRepeat") - public boolean isItemCodeRepeat(String itemCode,String oldItemCode) { + public boolean isItemCodeRepeat(String itemCode,String oldItemCode,String itType) { List list = Lists.newArrayList(); if(oldItemCode!=null&&itemCode.trim().equals(oldItemCode.trim())){ return true; } if(!StringUtil.isEmpty(itemCode)){ - list = sysDictInfoService.findByItemCode(itemCode); + SysDictInfo dict=new SysDictInfo(); + dict.setItemCode(itemCode); + dict.setItemType(Integer.valueOf(itType)); + list = sysDictInfoService.findByItemCode(dict); } if(list==null||list.size()==0){ return true; diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java index dd2daa119..47019b622 100644 --- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java @@ -55,7 +55,7 @@ public interface SysDictInfoDao extends CrudDao { * @param itemCode * @return */ - List findByItemCode(String itemCode); + List findByItemCode(@Param("sysDictInfo")SysDictInfo sysDictInfo); /** * 根据上级id选出所有下级 diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml index 9521430ae..a77b242e9 100644 --- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml @@ -232,10 +232,16 @@ - select - from sys_dict_info s where s.item_code = #{itemCode} + from sys_dict_info s where s.is_valid = 1 + + AND s.item_type = ${sysDictInfo.itemType} + + + AND s.item_code = ${sysDictInfo.itemCode} + diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java index 3b0fb65df..4e343cfbd 100644 --- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java @@ -206,8 +206,8 @@ public class SysDictInfoService extends BaseService{ * @param itemCode * @return */ - public List findByItemCode(String itemCode) { - return sysDictInfoDao.findByItemCode(itemCode); + public List findByItemCode(SysDictInfo sysDictInfo) { + return sysDictInfoDao.findByItemCode(sysDictInfo); } /** * 根据上级id选出所有下级 diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index f8c2c39eb..476d21819 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -61,7 +61,7 @@ validateForm = $("#inputForm").validate({ rules: { 'itemCode':{ - remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}' + remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}&itType=${itType}' }, 'itemType':{ remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}' From 8d48d9a354bb583e65c0e4b9196e306d9cda599b Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 10 Oct 2018 16:17:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=EF=BC=881=EF=BC=89=E9=9F=B3=E8=A7=86?= =?UTF-8?q?=E9=A2=91url=E6=97=A5=E5=BF=97=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=EF=BC=882=EF=BC=89=E6=89=80=E6=9C=89=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BC=A0=E8=BE=93=E5=B1=82=E5=8D=8F=E8=AE=AE=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9=20=EF=BC=883=EF=BC=89?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/log/NtcStreamMediaLog.java | 27 ++ .../log/ntc/MmAvUrlLogController.java | 16 +- .../resources/messages/message_en.properties | 5 +- .../resources/messages/message_ru.properties | 5 +- .../messages/message_zh_CN.properties | 5 +- .../views/log/manipulation/dkBehaviorList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/appList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/bgpList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/dnsList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/ftpList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/ipList.jsp | 12 +- .../WEB-INF/views/log/ntc/ipsecList.jsp | 4 +- .../WEB-INF/views/log/ntc/l2tpLogList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmAvIpList.jsp | 2 +- .../WEB-INF/views/log/ntc/mmAvUrlList.jsp | 4 +- .../views/log/ntc/mmFileDigestList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmPicIpList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmPicUrlList.jsp | 4 +- .../views/log/ntc/mmPornAudioSampleList.jsp | 4 +- .../views/log/ntc/mmPornVideoSampleList.jsp | 4 +- .../views/log/ntc/mmSampleAudioList.jsp | 4 +- .../views/log/ntc/mmSampleFaceList.jsp | 4 +- .../views/log/ntc/mmSampleLogoList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 4 +- .../views/log/ntc/mmSampleSpeakerList.jsp | 4 +- .../views/log/ntc/mmSampleVideoList.jsp | 4 +- .../views/log/ntc/mmSampleVoipList.jsp | 4 +- .../views/log/ntc/mmVoipAccountList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 4 +- .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 270 ++++++++++++++++++ .../WEB-INF/views/log/ntc/openVpnList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/p2pList.jsp | 4 +- .../WEB-INF/views/log/ntc/pptpLogList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/sshList.jsp | 4 +- .../WEB-INF/views/log/ntc/sslLogList.jsp | 4 +- .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 4 +- 39 files changed, 386 insertions(+), 80 deletions(-) create mode 100644 src/main/java/com/nis/domain/log/NtcStreamMediaLog.java create mode 100644 src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp diff --git a/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java new file mode 100644 index 000000000..ad74410e7 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java @@ -0,0 +1,27 @@ +package com.nis.domain.log; + +/** + * @ClassName:NtcStreamMediaLog + * @Description:TODO(这里用一句话描述这个类的作用) + * @author (wx) + * @date 2018年7月16日 下午3:11:42 + * @version V1.0 + */ +public class NtcStreamMediaLog extends BaseLogEntity { + + private static final long serialVersionUID = 1446933545638550170L; + protected String url; + protected String protocol; + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } +} 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 80f30463d..b0b8fa217 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 @@ -20,7 +20,7 @@ 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.MmAvUrlLog; +import com.nis.domain.log.NtcStreamMediaLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -42,11 +42,11 @@ public class MmAvUrlLogController extends BaseController{ * @throws IOException */ @RequestMapping(value={"list",""}) - public String list(Model model,@ModelAttribute("log")MmAvUrlLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { + public String list(Model model,@ModelAttribute("log")NtcStreamMediaLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { 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()); @@ -62,13 +62,13 @@ public class MmAvUrlLogController extends BaseController{ Gson gson = new GsonBuilder().create(); //gson泛型支持 - LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - Page data = fromJson.getData(); + Page data = fromJson.getData(); page.setList(data.getList()); - List list = page.getList(); - for (MmAvUrlLog l : list) { + List list = page.getList(); + for (NtcStreamMediaLog l : list) { l.setFunctionId(entry.getFunctionId()); setLogAction(l,serviceList); } @@ -79,7 +79,7 @@ public class MmAvUrlLogController extends BaseController{ logger.error("查询音视频url日志失败", e); addMessageLog(model, e.getMessage()); } - return "/log/ntc/mmAvUrlList"; + return "/log/ntc/ntcStreamMedia"; } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 932c8a8bb..bc702fc82 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1200,4 +1200,7 @@ dnat_policy=DNAT Reuse Policy report_total=Total message_type=Message Type as=AS -route=Route \ No newline at end of file +route=Route +transport_layer_protocol=TLS Protocol +av_voip_monit=VoIP Monit +av_voip_reject=VoIP Reject \ 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 eeba48c6b..6b4603bc9 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1202,4 +1202,7 @@ 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 +route=\u8DEF\u7531\u4FE1\u606F +transport_layer_protocol=TLS Protocol +av_voip_monit=VoIP\u76D1\u6D4B +av_voip_reject=VoIP\u7BA1\u63A7 \ 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 bed04829f..461a88a3d 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1194,4 +1194,7 @@ 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 +route=\u8DEF\u7531\u4FE1\u606F +transport_layer_protocol=\u4F20\u8F93\u5C42\u534F\u8BAE +av_voip_monit=VoIP\u76D1\u6D4B +av_voip_reject=VoIP\u7BA1\u63A7 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 443517053..cd8d985d2 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -111,7 +111,7 @@ $(document).ready(function(){
- + @@ -194,7 +194,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index c33373d1f..9798b5603 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -102,7 +102,7 @@ $(document).ready(function(){
- + @@ -174,7 +174,7 @@ $(document).ready(function(){ - + 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 9836888c7..87018298a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -97,7 +97,7 @@
- + @@ -172,7 +172,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 125594b0f..a4185893f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -89,7 +89,7 @@ $(document).ready(function(){