diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java index 360d946e6..6e9e98c04 100644 --- a/src/main/java/com/nis/domain/log/BaseLogEntity.java +++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java @@ -43,7 +43,38 @@ public class BaseLogEntity extends BaseEntity { protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识 protected String orderBy;//排序参数 + //新增字段 + protected Integer encapType;//原始二层封装格式 + protected Integer linkId;//串联设备链路号 + protected String innerSmac;//MAC_IN_MAC的内层源MAC + protected String innerDmac;//MAC_IN_MAC的内层目标MAC + + + public Integer getEncapType() { + return encapType; + } + public void setEncapType(Integer encapType) { + this.encapType = encapType; + } + public Integer getLinkId() { + return linkId; + } + public void setLinkId(Integer linkId) { + this.linkId = linkId; + } + public String getInnerSmac() { + return innerSmac; + } + public void setInnerSmac(String innerSmac) { + this.innerSmac = innerSmac; + } + public String getInnerDmac() { + return innerDmac; + } + public void setInnerDmac(String innerDmac) { + this.innerDmac = innerDmac; + } public String getOrderBy() { return orderBy; } diff --git a/src/main/java/com/nis/domain/log/NtcAppLog.java b/src/main/java/com/nis/domain/log/NtcAppLog.java index 6ea1a9838..b2d16ffe2 100644 --- a/src/main/java/com/nis/domain/log/NtcAppLog.java +++ b/src/main/java/com/nis/domain/log/NtcAppLog.java @@ -6,6 +6,53 @@ public class NtcAppLog extends BaseLogEntity { * */ private static final long serialVersionUID = 6025543701060412591L; + + protected Integer labelProtoId; //协议类型id + protected Integer labelProtoSource; //应用id + protected Integer labelBehavId; //行为id + protected Integer labelBehavSource; + protected Integer labelAppId; + protected Integer labelAppSource; + + + public Integer getLabelProtoId() { + return labelProtoId; + } + public void setLabelProtoId(Integer labelProtoId) { + this.labelProtoId = labelProtoId; + } + public Integer getLabelProtoSource() { + return labelProtoSource; + } + public void setLabelProtoSource(Integer labelProtoSource) { + this.labelProtoSource = labelProtoSource; + } + public Integer getLabelBehavId() { + return labelBehavId; + } + public void setLabelBehavId(Integer labelBehavId) { + this.labelBehavId = labelBehavId; + } + public Integer getLabelBehavSource() { + return labelBehavSource; + } + public void setLabelBehavSource(Integer labelBehavSource) { + this.labelBehavSource = labelBehavSource; + } + public Integer getLabelAppId() { + return labelAppId; + } + public void setLabelAppId(Integer labelAppId) { + this.labelAppId = labelAppId; + } + public Integer getLabelAppSource() { + return labelAppSource; + } + public void setLabelAppSource(Integer labelAppSource) { + this.labelAppSource = labelAppSource; + } + + } 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 8d86aeb92..1bc370668 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 @@ -23,10 +23,12 @@ import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.NtcAppLog; import com.nis.domain.maat.LogRecvData; +import com.nis.util.CodeDicUtils; import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.httpclient.HttpClientUtil; import com.nis.web.controller.BaseController; +import com.nis.web.dao.dashboard.codedic.CodeResult; @Controller @RequestMapping(value = "${adminPath}/log/ntc/ntcAppLogs") @@ -52,10 +54,19 @@ public class AppLogController extends BaseController{ params.put("pageNo", page.getPageNo()); //查询值判断 initLogSearchValue(entry,params); - List serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); model.addAttribute("serviceList", serviceList); + //获取字典信息 + List protocolList=CodeDicUtils.getCodeList("protocolCode"); + List osList=CodeDicUtils.getCodeList("osCode"); + List browserList=CodeDicUtils.getCodeList("browserCode"); + List behaviorList=CodeDicUtils.getCodeList("behaviorCode"); + List appList=CodeDicUtils.getCodeList("appCode"); + model.addAttribute("protocolList", protocolList); + model.addAttribute("behaviorList", behaviorList); + model.addAttribute("appList", appList); + String url = ""; url = Constants.LOG_BASE_URL+Constants.NTC_APP_LOG; String jsonString = HttpClientUtil.getMsg(url,params,request); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index e8b42020b..0c3fce7f0 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -882,8 +882,8 @@ file_upload_type_error=%s file type is incorrect,Allow uploaded files type conta file_upload_error=File upload failure! #=============multipart upload error info================= #=============function_service_dict==>service_name================= -audio_sample_reject=Multimedia Sample Block -audio_sample_monit=Multimedia Sample Monitor +audio_sample_reject=Audio Sample Block +audio_sample_monit=Audio Sample Monitor video_sample_reject=Video Sample Block video_sample_monit=Video Sample Monitor pic_sample_reject=Picture Sample Block @@ -896,31 +896,31 @@ video_pornography_sample_reject=Porn Detection Block video_pornography_sample_monit=Porn Detection Monitor ip_white_monit=IP Address White List Monitor ip_white_reject=IP Address White List Block -ip_white_whitelist=IP Address White List +ip_white_whitelist=IP White List av_voip_ip_reject=Multimedia VoIP Block av_voip_ip_monit=Multimedia VoIP Monitor -website_http_reject=Website Http Block -website_http_monit=Website Http Monitor +website_http_reject=URL Block +website_http_monit=URL Monitor website_http_whitelist=Website Http White List -domain_white_whitelist=Global Domain Name White List +domain_white_whitelist=URL White List av_content_ip_reject=Multimedia Content IP Block av_content_ip_monit=Multimedia Content IP Monitor -ip_reject=IP Configure Block -ip_monit=IP Configure Monitor -ip_drop=IP Configure Drop +ip_reject=IP Address Block +ip_monit=IP Address Monitor +ip_drop=IP Address Drop ssl_monit=SSL Monitor ssl_reject=SSL Block av_pic_ip_reject=Multimedia Picture IP Block av_pic_ip_monit=Multimedia Picture IP Monitor -av_content_url_reject=Multimedia Content Url Block -av_content_url_monit=Multimedia Content Url Monitor +av_content_url_reject=Streaming Media Block +av_content_url_monit=Streaming Media Monitor av_pic_url_reject=Multimedia Picture Url Block av_pic_url_monit=Multimedia Picture Url Monitor ip_loop=IP Configure Loop -website_dns_reject=Website DNS Block -website_dns_monit=Website DNS Monitor -mail_reject=Mail Block -mail_monit=Mail Monitor +website_dns_reject=DNS Block +website_dns_monit=DNS Monitor +mail_reject=Mail Advanced Block +mail_monit=Mail Advanced Monitor ssh_monit=SSH Monitor ssh_reject=SSH Block ftp_monit=FTP Monitor @@ -941,20 +941,20 @@ ipsec_drop=IPSEC Drop ipsec_monit=IPSEC Monitor bgp_reject=BGP Block bgp_monit=BGP Monitor -file_transfer_digest_monit=File Transfer Summary Monitor -file_transfer_digest_reject=File Transfer Summary Block +file_transfer_digest_monit=File Digest Monitor +file_transfer_digest_reject=File Digest Block xmpp_monit=XMPP Monitor xmpp_reject=XMPP Block ip_intercepter_monit=IP Intercept Monitor domain_monit=Domain Intercept Monitor ip_intercepter_whitelist=IP Intercept White List domain_monit_whitelist=Domain Intercept White List -dns_strategy_reject=DNS Response Strategy Block +dns_strategy_reject=DNS Response Profiles Block proxy_http_req_body_replace=HTTP Request Body Replace proxy_http_res_body_replace=HTTP Response Body Replace -dns_fake_ip_reject=DNS Spoofing IP Block -app_strategy_reject=APP Strategy Block -app_strategy_ratelimit=APP Strategy Rate Limit +dns_fake_ip_reject=Spoofing IP Block +app_strategy_reject=APP Identify Block +app_strategy_ratelimit=APP Identify Rate Limit proxy_ip_redirect=IP Redirect proxy_ip_forward=IP Forward app_protocol_ip_reject=App Identify IP Block @@ -964,10 +964,10 @@ app_domain_feature_monit=APP Domain Feature Monitor app_byte_feature_monit=APP Byte Feature Monitor proxy_domain_forward=Domain Forward ip_complex_loop=IP Complex -ddos_ip_drop=DDOS IP +ddos_ip_drop=Anti DDOS Drop ip_reuse_adress_pool_loop=IP Reuse Address Pool -app_strategy_monit=APP Strategy Monitor -app_strategy_drop=APP Strategy Drop +app_strategy_monit=APP Identify Monitor +app_strategy_drop=APP Identify Drop ctrl_http_reject=HTTP(s) Block ctrl_http_redirect=HTTP(s) Redirect ctrl_http_replace=HTTP(s) Replace @@ -1075,9 +1075,9 @@ WHITE_LIST_SUBSCRIBE_ID=Subscribe ID app_header_config=APP Header Feature app_ssl_config=APP SSL Cert Feature -ip_intercepter_replace=IP Intercept Replace +ip_intercepter_replace=IP Payload Replace domain_intercepter_replace=Domain Intercept Replace -ip_intercepter_ratelimit=IP Intercept Rate Limit +ip_intercepter_ratelimit=IP Address Rate Limit domain_intercepter_ratelimit=Domain Intercept Rate Limit app_built_in_features_config=APP Built-in Features PXY_INTERCEPT_PKT_BIN=Packet Payload @@ -1191,10 +1191,10 @@ APP_HTTP_ADMIN=APP HTTP Admin APP_DNS_ADMIN=APP DNS Admin APP_SSL_ADMIN=APP SSL Admin APP_DK_GL=APP DK GL Admin -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 +dnat_ip_complex_loop=DNAT Reuse Policy Loop +snat_ip_complex_loop=SNAT Reuse Policy Loop +snat_ip_reuse_adress_pool_loop=SNAT Address Pool Loop +dnat_ip_reuse_adress_pool_loop=DNAT Address Pool Loop snat_policy=SNAT Reuse Policy dnat_policy=DNAT Reuse Policy report_total=Total @@ -1205,8 +1205,8 @@ transport_layer_protocol=TLS Protocol av_voip_monit=VoIP Monitor av_voip_reject=VoIP Block label_proto_source=Protocol Source -label_behav_source=Behavior Source -label_app_source=APP Source +label_behav_source=Behavior Source +label_app_source=APP Source packet=Packet stream=Stream protocol_menu=Protocol @@ -1215,7 +1215,7 @@ protocol_identify=Protocol Identify MM_FILE_DIGEST=File Digest Configuration NTC_ASN_IP=ASN NTC_STREAMING_MEDIA_URL=Streaming Media URL -NTC_VOIP_ACCOUNT=VoIP Account +NTC_VOIP_ACCOUNT=VoIP Account export_failed=Export Failed user_manage=Client Account Manage ip_reuse_policy_object=IP Reuse Policy Object @@ -1245,7 +1245,7 @@ mail_address_whitelist=Mail Address White List mail_address_monit=Mail Address Monitor mail_address_reject=Mail Address Block ipsec_protocol=IPSEC Protocol -intercept_intensity=Affect Related Domains +intercept_intensity=Intercept Related Domains exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit. file_in_wrong_format=File Format Error select_certificate=Please Select Certificate Type First @@ -1267,7 +1267,7 @@ alternative_values= Alternative values can be %s certificate_error=Wrong format of public key file and private key file public_file_error=Wrong format of public key file private_file_error=Wrong format of private key file -keyframe_pic_required=No keyframe pictures have been selected. +keyframe_pic_required=No keyframe pictures have been selected. ipv4_range_tip=IPv4 Range ipv4_subnet_tip=IPv4/Subnet Mask ipv6_range_tip=IPv6 Range @@ -1282,7 +1282,7 @@ single_keyword_tip=Only single key input is allowed. ipv4_mask_range_tip=IP mask must between 16 and 32 ipv6_mask_range_tip=IP Mask must between 2 and 128 letter_cancel_info=Cancel Letter Info -import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import. +import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls or .xlsx to import. http_keyword=Website Keyword http_keyword_monit=Website Keyword Monit http_keyword_reject=Website Keyword Block @@ -1298,7 +1298,7 @@ ruleLimitTip=The number of effective rules has reached the limit(%s). av_protocol_note=Note:Recognizable Protocols Include RTSP,RTMP. ip_range_in_the_same=Start IP and end IP in a IP range must with in the same subnet log_to_url=To HTTP URL -source_compile_id=Configuration Source +source_compile_id=Configuration Source most_keywords=%s can have 1024 chars at most hex_case_insensitive=Hexadecimal values must case insensitive default_request=Default Letter @@ -1306,4 +1306,15 @@ default_value=Default Value intercept=Intercept unkown_error=Unkown Error Infomation exception_info=Exception Infomation -no_tc_udp_port_comment_tip=Port must between 0 \ No newline at end of file +no_tc_udp_port_comment_tip=Port must between 0 +website_advanced_reject=HTTP Advanced Block +website_advanced_monit=HTTP Advanced Monit +snat_ip_reuse_adress_pool_loop=SNAT Address Pool Loop +dnat_ip_reuse_adress_pool_loop=DNAT Address Pool Loop +dnat_ip_complex_loop=DNAT Reuse Policy Loop +snat_ip_complex_loop=SNAT Reuse Policy Loop +encap_type=Encap Type +link_id=Link Id +inner_smac=Inner SMAC +inner_dmac=Inner DMAC +ethernet=Ethernet \ 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 96baeb0c4..a4ab59e31 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -880,48 +880,48 @@ file_upload_type_error=%s\u6587\u4EF6\u7C7B\u578B\u51FA\u9519\uFF0C\u5141\u8BB8\ file_upload_error=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01 #=============multipart upload error info================= #=============multipart upload error info================= -audio_sample_reject=\u591A\u5A92\u4F53\u6837\u4F8B\u7BA1\u63A7 -audio_sample_monit=\u591A\u5A92\u4F53\u6837\u4F8B\u76D1\u6D4B -video_sample_reject=\u89C6\u9891\u6837\u4F8B\u7BA1\u63A7 +audio_sample_reject=\u97F3\u9891\u6837\u4F8B\u963B\u65AD +audio_sample_monit=\u97F3\u9891\u6837\u4F8B\u76D1\u6D4B +video_sample_reject=\u89C6\u9891\u6837\u4F8B\u963B\u65AD video_sample_monit=\u89C6\u9891\u6837\u4F8B\u76D1\u6D4B -pic_sample_reject=\u56FE\u7247\u6837\u4F8B\u7BA1\u63A7 +pic_sample_reject=\u56FE\u7247\u6837\u4F8B\u963B\u65AD pic_sample_monit=\u56FE\u7247\u6837\u4F8B\u76D1\u6D4B -voip_sample_reject=VoIP\u6837\u4F8B\u7BA1\u63A7 +voip_sample_reject=VoIP\u6837\u4F8B\u963B\u65AD voip_sample_monit=VoIP\u6837\u4F8B\u76D1\u6D4B audio_pornography_sample_reject=\u97F3\u9891\u573A\u666F\u7BA1\u63A7 audio_pornography_sample_monit=\u97F3\u9891\u573A\u666F\u76D1\u6D4B -video_pornography_sample_reject=\u89C6\u9891\u573A\u666F\u7BA1\u63A7 +video_pornography_sample_reject=\u89C6\u9891\u573A\u666F\u963B\u65AD video_pornography_sample_monit=\u89C6\u9891\u573A\u666F\u76D1\u6D4B ip_white_monit=IP\u5730\u5740\u767D\u540D\u5355\u76D1\u6D4B ip_white_reject=IP\u5730\u5740\u767D\u540D\u5355\u7BA1\u63A7 -ip_white_whitelist=IP\u5730\u5740\u767D\u540D\u5355 +ip_white_whitelist=IP\u767D\u540D\u5355 av_voip_ip_reject=\u591A\u5A92\u4F53VoIP IP\u7BA1\u63A7 av_voip_ip_monit=\u591A\u5A92\u4F53VoIP IP\u76D1\u6D4B -website_http_reject=\u7F51\u7AD9HTTP\u7BA1\u63A7 -website_http_monit=\u7F51\u7AD9HTTP\u76D1\u6D4B -domain_white_whitelist=\u5168\u5C40\u57DF\u540D\u767D\u540D\u5355 +website_http_reject=URL\u963B\u65AD +website_http_monit=URL\u76D1\u6D4B +domain_white_whitelist=URL\u767D\u540D\u5355 av_content_ip_reject=\u591A\u5A92\u4F53\u5185\u5BB9IP\u914D\u7F6E\u7BA1\u63A7 av_content_ip_monit=\u591A\u5A92\u4F53\u5185\u5BB9IP\u914D\u7F6E\u76D1\u6D4B -ip_reject=IP\u914D\u7F6E\u7BA1\u63A7 -ip_monit=IP\u914D\u7F6E\u76D1\u6D4B -ip_drop=IP\u914D\u7F6E\u4E22\u5F03 +ip_reject=IP\u5730\u5740\u963B\u65AD +ip_monit=IP\u5730\u5740\u76D1\u6D4B +ip_drop=IP\u5730\u5740\u4E22\u5F03 ssl_monit=SSL\u76D1\u6D4B -ssl_reject=SSL\u7BA1\u63A7 +ssl_reject=SSL\u963B\u65AD av_pic_ip_reject=\u591A\u5A92\u4F53\u56FE\u7247IP\u914D\u7F6E\u7BA1\u63A7 av_pic_ip_monit=\u591A\u5A92\u4F53\u56FE\u7247IP\u914D\u7F6E\u76D1\u6D4B -av_content_url_reject=\u591A\u5A92\u4F53\u5185\u5BB9URL\u914D\u7F6E\u7BA1\u63A7 -av_content_url_monit=\u591A\u5A92\u4F53\u5185\u5BB9URL\u914D\u7F6E\u76D1\u6D4B +av_content_url_reject=\u6D41\u5A92\u4F53\u534F\u8BAE\u963B\u65AD +av_content_url_monit=\u6D41\u5A92\u4F53\u534F\u8BAE\u76D1\u6D4B av_pic_url_reject=\u591A\u5A92\u4F53\u56FE\u7247URL\u914D\u7F6E\u7BA1\u63A7 av_pic_url_monit=\u591A\u5A92\u4F53\u56FE\u7247URL\u914D\u7F6E\u76D1\u6D4B ip_loop=IP\u914D\u7F6E\u56DE\u6D41 -website_dns_reject=\u7F51\u7AD9DNS\u7BA1\u63A7 -website_dns_monit=\u7F51\u7AD9DNS\u76D1\u6D4B -mail_reject=\u90AE\u4EF6\u7BA1\u63A7 -mail_monit=\u90AE\u4EF6\u76D1\u6D4B +website_dns_reject=DNS\u963B\u65AD +website_dns_monit=DNS\u76D1\u6D4B +mail_reject=Mail Advanced\u963B\u65AD +mail_monit=Mail Advanced\u76D1\u6D4B ssh_monit=SSH\u76D1\u6D4B ssh_reject=SSH\u7BA1\u63A7 ftp_monit=FTP\u76D1\u6D4B -ftp_reject=FTP\u7BA1\u63A7 +ftp_reject=FTP\u963B\u65AD openvpn_reject=OpenVPN\u7BA1\u63A7 openvpn_monit=OpenVPN\u76D1\u6D4B l2tp_reject=L2TP\u7BA1\u63A7 @@ -936,22 +936,22 @@ ike_drop=IKE\u4E22\u5F03 ike_monit=IKE\u76D1\u6D4B ipsec_drop=IPSEC\u4E22\u5F03 ipsec_monit=IPSEC\u76D1\u6D4B -bgp_reject=BGP\u7BA1\u63A7 +bgp_reject=BGP\u963B\u65AD bgp_monit=BGP\u76D1\u6D4B -file_transfer_digest_monit=\u6587\u4EF6\u4F20\u8F93\u6458\u8981\u76D1\u6D4B -file_transfer_digest_reject=\u6587\u4EF6\u4F20\u8F93\u6458\u8981\u7BA1\u63A7 +file_transfer_digest_monit=\u6587\u4EF6\u6458\u8981\u76D1\u6D4B +file_transfer_digest_reject=\u6587\u4EF6\u6458\u8981\u963B\u65AD xmpp_monit=XMPP\u76D1\u6D4B xmpp_reject=XMPP\u7BA1\u63A7 -ip_intercepter_monit=IP\u62E6\u622A -domain_monit=\u57DF\u540D\u62E6\u622A -ip_intercepter_whitelist=\u62E6\u622A\u767D\u540D\u5355 +ip_intercepter_monit=IP\u62E6\u622A\u76D1\u6D4B +domain_monit=\u57DF\u540D\u62E6\u622A\u76D1\u6D4B +ip_intercepter_whitelist=IP\u62E6\u622A\u767D\u540D\u5355 domain_monit_whitelist=\u62E6\u622A\u767D\u540D\u5355 -dns_strategy_reject=DNS\u54CD\u5E94\u7B56\u7565\u7BA1\u63A7 +dns_strategy_reject=DNS\u54CD\u5E94\u7B56\u7565\u963B\u65AD proxy_http_req_body_replace=HTTP\u8BF7\u6C42\u5185\u5BB9\u66FF\u6362 proxy_http_res_body_replace=HTTP\u54CD\u5E94\u5185\u5BB9\u66FF\u6362 -dns_fake_ip_reject=DNS\u6B3A\u9A97IP\u7BA1\u63A7 -app_strategy_reject=APP\u7B56\u7565\u7BA1\u63A7 -app_strategy_ratelimit=APP\u7B56\u7565\u9650\u901F +dns_fake_ip_reject=\u6B3A\u9A97IP\u963B\u65AD +app_strategy_reject=APP\u534F\u8BAE\u963B\u65AD +app_strategy_ratelimit=APP\u534F\u8BAE\u9650\u901F proxy_ip_redirect=IP \u91CD\u5B9A\u5411 proxy_ip_forward=IP\u8F6C\u53D1 app_protocol_ip_reject=APP\u534F\u8BAEIP\u7BA1\u63A7 @@ -961,12 +961,12 @@ app_domain_feature_monit=APP\u57DF\u540D\u7279\u5F81\u76D1\u6D4B app_byte_feature_monit=APP\u5B57\u8282\u7279\u5F81\u76D1\u6D4B proxy_domain_forward=\u57DF\u540D\u8F6C\u53D1 ip_complex_loop=IP\u590D\u7528 -ddos_ip_drop=DDOS\u76EE\u6807\u9632\u62A4IP +ddos_ip_drop=\u6297DDOS\u653B\u51FB\u4E22\u5F03 ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41 -app_strategy_monit=APP\u7B56\u7565\u76D1\u6D4B -app_strategy_drop=APP\u7B56\u7565\u4E22\u5F03 +app_strategy_monit=APP\u534F\u8BAE\u76D1\u6D4B +app_strategy_drop=APP\u534F\u8BAE\u4E22\u5F03 ctrl_http_reject=HTTP(S)\u7BA1\u63A7 -ctrl_http_redirect=HTTP(S)\u91CD\u5B9A\u5411 +ctrl_http_redirect=HTTP(S)\u91CD\u5B9A\u5411\u914D\u7F6E ctrl_http_replace=HTTP(S)\u66FF\u6362 ctrl_http_monit=HTTP(S)\u76D1\u6D4B ctrl_http_whitelist=HTTP(S)\u767D\u540D\u5355 @@ -1012,10 +1012,10 @@ Proxy=\u56FD\u5BB6\u4EE3\u7406 selective=\u9009\u62E9\u533A\u57DF max_shouldnot_less_than_min=\u6700\u5927\u9879\u4E0D\u80FD\u5C0F\u4E8E\u6700\u5C0F\u9879 unknown_cfg_type=\u672A\u77E5\u7684\u914D\u7F6E\u7C7B\u578B -basic_protocol_reject=\u57FA\u7840\u534F\u8BAE\u963B\u65AD -basic_protocol_ratelimit=\u57FA\u7840\u534F\u8BAE\u9650\u901F -basic_protocol_monit=\u57FA\u7840\u534F\u8BAE\u76D1\u6D4B -basic_protocol_drop=\u57FA\u7840\u534F\u8BAE\u4E22\u5F03 +basic_protocol_reject=Protocol Identify\u963B\u65AD +basic_protocol_ratelimit=Protocol Identify\u9650\u901F +basic_protocol_monit=Protocol Identify\u76D1\u6D4B +basic_protocol_drop=Protocol Identify\u4E22\u5F03 encrypted_tunnel_behavior_reject=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u963B\u65AD encrypted_tunnel_behavior_ratelimit=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u9650\u901F encrypted_tunnel_behavior_monit=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u76D1\u6D4B @@ -1051,7 +1051,7 @@ case_insenstive=\u5927\u5C0F\u5199\u4E0D\u654F\u611F hex=\u5341\u516D\u8FDB\u5236 not_hex=\u975E\u5341\u516D\u8FDB\u5236 -p2p_reject=P2P\u7BA1\u63A7 +p2p_reject=P2P\u963B\u65AD NTC_P2P_IP=IP\u914D\u7F6E NTC_P2P_HASH_BIN=\u6587\u4EF6\u6807\u8BC6\u914D\u7F6E NTC_P2P_KEYWORDS=eMule\u641C\u7D22\u5173\u952E\u8BCD\u914D\u7F6E @@ -1073,13 +1073,13 @@ WHITE_LIST_SUBSCRIBE_ID=\u8D26\u53F7 app_header_config=APP\u5C42\u5934\u7279\u5F81 app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81 -ip_intercepter_replace=IP\u62E6\u622A\u66FF\u6362 +ip_intercepter_replace=IP\u8F7D\u8377\u66FF\u6362 domain_intercepter_replace=\u57DF\u540D\u62E6\u622A\u66FF\u6362 -ip_intercepter_ratelimit=IP\u62E6\u622A\u9650\u901F +ip_intercepter_ratelimit=IP\u5730\u5740\u9650\u901F domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F -app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4 +app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4 PXY_INTERCEPT_PKT_BIN=\u5305\u8F7D\u8377 -certificate=\u8BC1\u4E66 +certificate=\u8BC1\u4E66 do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7 file_strategy=\u6587\u4EF6\u7B56\u7565 file_desc=\u6587\u4EF6\u63CF\u8FF0\t @@ -1113,9 +1113,9 @@ issuer=\u8BC1\u4E66\u9881\u53D1\u8005 certificate_subject=\u8BC1\u4E66\u62E5\u6709\u8005 not_before_time=\u8BC1\u4E66\u8D77\u59CB\u65F6\u95F4 not_after_time=\u8BC1\u4E66\u7EC8\u6B62\u65F6\u95F4 -certificate_validity=\u8BC1\u4E66\u6709\u6548\u671F -header=\u5173\u952E\u5B57 -layer=\u5339\u914D\u533A\u57DF +certificate_validity=\u8BC1\u4E66\u6709\u6548\u671F +header=\u5173\u952E\u5B57 +layer=\u5339\u914D\u533A\u57DF can_not_delete_issued_asn_group=\u4E0D\u80FD\u5220\u9664\u5DF2\u7ECF\u4E0B\u53D1\u8FC7\u7684ASN\u5206\u7EC4 bandwith=\u5E26\u5BBD limit_rate_type=\u9650\u901F\u65B9\u5F0F @@ -1174,7 +1174,7 @@ av_content_url_note=\u6CE8\uFF1A\u53EF\u8BC6\u522B\u534F\u8BAE\u5305\u62ECRTSP\u protocol_note=\u6CE8\uFF1A\u53EF\u8BC6\u522B\u534F\u8BAE\u5305\u62ECSIP\u3001RTCP\u3001RTP\u3002 snat_multiplex=SNAT\u5730\u5740\u6C60\u7BA1\u7406 dnat_multiplex=DNAT\u5730\u5740\u6C60\u7BA1\u7406 -asn_reject=ASN\u7BA1\u63A7 +asn_reject=ASN\u963B\u65AD asn_monit=ASN\u76D1\u6D4B ip_payload=IP\u8F7D\u8377 streaming_media=\u6D41\u5A92\u4F53\u534F\u8BAE @@ -1188,17 +1188,17 @@ APP_DNS_ADMIN=APP DNS Admin APP_SSL_ADMIN=APP SSL Admin APP_DK_GL=APP\u591A\u7528\u9014\u6807\u7B7E dnat_complex_loop=DNAT IP\u590D\u7528\u56DE\u6D41 -snat_policy=SNAT\u590D\u7528\u7B56\u7565 -dnat_policy=DNAT\u590D\u7528\u7B56\u7565 +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 transport_layer_protocol=\u4F20\u8F93\u5C42\u534F\u8BAE av_voip_monit=VoIP\u76D1\u6D4B -av_voip_reject=VoIP\u7BA1\u63A7 +av_voip_reject=VoIP\u963B\u65AD label_proto_source=\u534F\u8BAE\u6765\u6E90 label_behav_source=\u884C\u4E3A\u6765\u6E90 -label_app_source=\u5E94\u7528\u6765\u6E90 +label_app_source=\u5E94\u7528\u6765\u6E90 packet=Packet stream=Stream protocol_menu=Protocol @@ -1207,7 +1207,7 @@ protocol_identify=Protocol Identify MM_FILE_DIGEST=\u6587\u4EF6\u6458\u8981\u914D\u7F6E NTC_ASN_IP=ASN NTC_STREAMING_MEDIA_URL=Streaming Media URL -NTC_VOIP_ACCOUNT=VoIP Account +NTC_VOIP_ACCOUNT=VoIP Account export_failed=\u5BFC\u51FA\u5931\u8D25 user_manage=\u5BA2\u6237\u7AEF\u8D26\u53F7\u7BA1\u7406 ip_reuse_policy_object=IP\u590D\u7528\u7B56\u7565\u5BF9\u8C61 @@ -1235,11 +1235,11 @@ usual_ddos=\u5E38\u7528DDOS\u653B\u51FB mail_address=\u90AE\u4EF6\u5730\u5740 mail_address_whitelist=\u90AE\u4EF6\u5730\u5740\u767D\u540D\u5355 mail_address_monit=\u90AE\u4EF6\u5730\u5740\u76D1\u6D4B -mail_address_reject=\u90AE\u4EF6\u5730\u5740\u7BA1\u63A7 +mail_address_reject=\u90AE\u4EF6\u5730\u5740\u963B\u65AD ipsec_protocol=IPSEC\u534F\u8BAE intercept_intensity=\u62E6\u622A\u5F3A\u5EA6 exceeds_duration_limit=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25,\u6587\u4EF6\u65F6\u957F\u8D85\u51FA\u9650\u5236. -file_in_wrong_format=\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF +file_in_wrong_format=\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF select_certificate=\u8BF7\u5148\u9009\u62E9\u6587\u4EF6\u8BC1\u4E66\u7C7B\u578B root_certificate=der cer crt pem intermediate_entity_certificate=p12 @@ -1274,7 +1274,7 @@ single_keyword_tip=Only single key input is allowed. ipv4_mask_range_tip=IP\u63A9\u7801\u5FC5\u987B\u4ECB\u4E8E16\u548C32\u4E4B\u95F4 ipv6_mask_range_tip=IP\u63A9\u7801\u5FC5\u987B\u4ECB\u4E8E2\u548C128\u4E4B\u95F4 letter_cancel_info=\u53D6\u6D88\u5BA1\u6838\u6765\u51FD -import_tip_excel=\u8BF7\u9009\u62E9\u6587\u4EF6\u7ED3\u5C3E\u4E3A.xls\u6216\u8005.xlsx\u7684\u6709\u6548Excel\u6587\u4EF6\u5BFC\u5165 +import_tip_excel=\u8BF7\u9009\u62E9\u6587\u4EF6\u7ED3\u5C3E\u4E3A.xls\u6216\u8005.xlsx\u7684\u6709\u6548Excel\u6587\u4EF6\u5BFC\u5165 http_keyword=\u7F51\u9875\u5173\u952E\u5B57 http_keyword_monit=\u7F51\u9875\u5173\u952E\u5B57\u76D1\u6D4B http_keyword_reject=\u7F51\u9875\u5173\u952E\u5B57\u963B\u65AD @@ -1290,11 +1290,21 @@ ruleLimitTip=\u6709\u6548\u89C4\u5219\u91CF\u5DF2\u8FBE\u5230\u9650\u5236(%s). av_protocol_note=\u6CE8\uFF1A\u53EF\u8BC6\u522B\u534F\u8BAE\u5305\u62EC RTSP\u3001RTMP\u3002 ip_range_in_the_same=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u5FC5\u987B\u5728\u76F8\u540C\u7F51\u6BB5 log_to_url=\u8F6CHTTP URL\u914D\u7F6E -source_compile_id=\u914D\u7F6E\u6765\u6E90 +source_compile_id=\u914D\u7F6E\u6765\u6E90 most_keywords=%s\u6700\u591A\u5305\u542B1024\u4E2A\u5B57\u7B26 hex_case_insensitive=16\u8FDB\u5236\u7684\u503C\u5927\u5C0F\u5199\u4E0D\u654F\u611F default_request=\u9ED8\u8BA4\u51FD -default_value=\u9ED8\u8BA4\u503C unkown_error=\u672A\u77E5\u9519\u8BEF\u4FE1\u606F exception_info=\u5F02\u5E38\u4FE1\u606F -no_tc_udp_port_comment_tip=Port must between 0 \ No newline at end of file +no_tc_udp_port_comment_tip=Port must between 0 +website_advanced_reject=HTTP Advanced\u963B\u65AD +website_advanced_monit=HTTP Advanced\u76D1\u6D4B +snat_ip_reuse_adress_pool_loop=SNAT\u5730\u5740\u6C60\u7BA1\u7406\u56DE\u6D41 +dnat_ip_reuse_adress_pool_loop=DNAT\u5730\u5740\u6C60\u7BA1\u7406\u56DE\u6D41 +dnat_ip_complex_loop=DNAT\u590D\u7528\u7B56\u7565\u56DE\u6D41 +snat_ip_complex_loop=SNAT\u590D\u7528\u7B56\u7565\u56DE\u6D41 +encap_type=\u539F\u59CB\u4E8C\u5C42\u5C01\u88C5\u683C\u5F0F +link_id=\u4E32\u8054\u8BBE\u5907\u94FE\u8DEF\u53F7 +inner_smac=\u5185\u5C42\u6E90MAC +inner_dmac=\u5185\u5C42\u76EE\u6807MAC +ethernet=\u4EE5\u592A\u7F51 \ No newline at end of file diff --git a/src/main/resources/sql/20181102/update_service_dict.sql b/src/main/resources/sql/20181102/update_service_dict.sql new file mode 100644 index 000000000..7ef539b7e --- /dev/null +++ b/src/main/resources/sql/20181102/update_service_dict.sql @@ -0,0 +1,20 @@ +#޸advancedservice_name +UPDATE `function_service_dict` SET `service_name`='website_advanced_reject' WHERE (`dict_id`='18'); +UPDATE `function_service_dict` SET `service_name`='website_advanced_monit' WHERE (`dict_id`='19'); +#޸APP PAYLOAD ADMINservice_name +UPDATE `function_service_dict` SET `service_name`='APP_PAYLOAD_ADMIN' WHERE (`dict_id`='132'); +#޸APP HTTP ADMINservice_name +UPDATE `function_service_dict` SET `service_name`='APP_HTTP_ADMIN' WHERE (`dict_id`='134'); +#޸APP DNS ADMINservice_name +UPDATE `function_service_dict` SET `service_name`='APP_DNS_ADMIN' WHERE (`dict_id`='133'); +#޸APP SSL ADMINservice_name +UPDATE `function_service_dict` SET `service_name`='APP_SSL_ADMIN' WHERE (`dict_id`='135'); +#޸֤Եservice_name +UPDATE `function_service_dict` SET `service_name`='intercept_file_strategy' WHERE (`dict_id`='116'); + +#־ѯ-ԭʼװʽֵ +INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('2976', '0', 'ethernet', '̫', '0', '1', '1', '126'); +INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('2977', '8', 'PPP', '', '0', '1', '1', '126'); +INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('2978', '12', 'Cisco HDLC', '', '0', '1', '1', '126'); + +INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('126', '־ѯ-ԭʼװʽ', 'ENCAP_TYPE', '', '', '2018-10-31 19:18:11', '2018-10-31 19:18:11', '1'); diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 52ac45aad..46ccd72ac 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -330,13 +330,13 @@ + - <%-- --%> @@ -377,6 +377,7 @@ +
@@ -449,7 +450,6 @@ - <%--
--%> ${indexCfg.creatorName } ${indexCfg.editorName } 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 e7c00f5e2..695932f43 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -184,17 +184,17 @@ $(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 11f031676..b39d5b624 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -167,36 +167,52 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - -<%-- --%> - - - - - - - - - - - - - + - + + - - - - + + + + + + + + + + - <%-- --%> + + + + + + - -
${log.cfgId } ${log.cfgId } + + @@ -204,16 +220,15 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + ${fns:abbr(log.capIp, 42)}${log.transProto} @@ -221,37 +236,82 @@ $(document).ready(function(){ ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort}${log.dPort }${log.sPort } + + + + + + + + + + + + + ${log.labelProtoSource} + + + + + + + + ${log.labelBehavSource} + + + + + + + + ${log.labelAppSource} + ${log.linkId } - - - + + + - - - + + + - ${log.addrList} - ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
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 b2abf998d..f6d17f58c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -164,31 +164,37 @@
- +
- - + + - - - + + - + + + + + + - <%-- --%> + + - - - - - <%-- --%> + + + + + + @@ -208,15 +214,14 @@ + - - + + + + + - <%-- --%> + + - <%-- --%> + +
${log.foundTime }${log.recvTime } - - + + ${fns:abbr(log.capIp, 42)}${log.transProto } @@ -226,9 +231,22 @@ ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + + + + + + + + ${log.linkId } + + @@ -236,19 +254,23 @@ ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} ${log.addrList }${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.sceneFile}${log.userRegion}${log.sceneFile} ${type.itemValue} 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 47926d54d..66ceea1f9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -157,46 +157,54 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - -<%-- --%> -<%-- --%> -<%-- --%> - - - - - -<%-- --%> - -<%-- --%> - - - -<%-- --%> - -<%-- --%> - - - - - - - - - - - + - + + + + + + + + @@ -224,53 +249,51 @@ $(document).ready(function(){ -<%-- --%> -<%-- --%> - <%-- + + --%> - - - - -<%-- --%> - -<%-- --%> + + + -<%-- + + + + -<%-- --%> + + - -
${log.cfgId } ${log.cfgId } + + @@ -204,11 +212,28 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.attackMaxPps} ${log.attackMaxBps}${log.attackTotalPkt}${log.attackTotalByte} + ${log.attackTotalPkt}${log.attackTotalByte} - ${fns:abbr(log.capIp, 42)}${log.transProto} - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} ${log.linkId } - - - + + + - - - + + + --%> -<%-- ${fns:stringFormat(log.addrList,30)} --%> - + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate}${log.clientLocate}${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index d637ae276..0e737a5f8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -173,50 +173,55 @@
- +
- - + + - - - <%-- - - - - - - - --%> - - <%-- - --%> - - - + + - + + + + + + + + + + + + + + + + + + - <%-- --%> + + - - - - + + + + + - + - + + + + + + + - <%-- --%> + - <%-- - --%> + + - - - - - - - + + + + - <%-- --%> + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 05bed22ad..4f3b51a10 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -168,40 +168,48 @@ $(document).ready(function(){
ip
${log.cfgId } + ${log.cfgId } @@ -227,6 +232,23 @@ ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } @@ -235,11 +257,6 @@ - - ${ipType.itemValue} - - @@ -268,44 +285,43 @@ ${opcode.itemValue} - ${fns:abbr(log.qname, 30)}${log.cname }${log.dnsSub }${log.cname }${log.dnsSub }${fns:abbr(log.capIp, 42)}${log.transProto } - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } ${log.linkId } - + + + + + ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} ${log.addrList }${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - -<%-- --%> - - - - - - - - - - - - - + - + + + + + + + + @@ -241,44 +266,43 @@ $(document).ready(function(){ ${log.ftpContent} - - - - - - - + -<%-- --%> + + + + + + - -
${log.cfgId } ${log.cfgId } + + @@ -209,11 +217,28 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${fns:abbr(log.capIp, 42)}${log.transProto} - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} ${log.linkId } - - - + + + - - - + + + ${log.addrList}${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 7d635141c..56fb403d3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -197,51 +197,47 @@
- +
- - - + + - - - - <%-- - - - - - - - --%> - - - - + + - + + + + + + + + + + - <%-- --%> + + - - - - + + + + + - + - - + + + + + + + - <%-- - - - - - - - --%> - - - - - - - + + + + - <%-- --%> + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 05cca2131..0b76e42c2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -176,46 +176,52 @@
URL         URL        
${log.cfgId } + ${log.cfgId } @@ -252,6 +248,23 @@ ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } @@ -269,101 +282,40 @@ http://${log.url} --%> ${log.reqHdrKey } - - - ${fn:substring(log.reqHdrFile,0,20) } - - - - - http://${fn:substring(log.reqHdrFile,0,20) } - - - ${log.reqBodyKey } - - - ${fn:substring(log.reqBodyFile,0,20) } - - - - - http://${fn:substring(log.reqBodyFile,0,20) } - - - ${log.resHdrKey } - - - ${fn:substring(log.resHdrFile,0,20) } - - - - - http://${fn:substring(log.resHdrFile,0,20) } - - - ${log.resBodyKey } - - - ${fn:substring(log.resBodyFile,0,20) } - - - - - http://${fn:substring(log.resBodyFile,0,20) } - - - ${log.website }${fns:abbr(log.capIp, 42)}${log.transProto } - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } ${log.linkId } - + + + + + ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} ${log.addrList }${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
- - + + - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + - <%-- --%> + + - - - - + + + + + - + - + + + + + + + - - - - - - - + + + + + - <%-- --%> + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index 1441c0611..22e972f3f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -169,27 +169,33 @@
URL         URL        
${log.cfgId } + ${log.cfgId } @@ -226,6 +232,23 @@ ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } @@ -305,39 +328,39 @@ ${log.website }${fns:abbr(log.capIp, 42)}${log.transProto } - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } ${log.linkId } - + + + + + ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} ${log.addrList }${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
- - + + - - - + + - + + + + + + - <%-- --%> + + - - - - + + + + + @@ -207,15 +213,14 @@ + - - + + + + + - <%-- --%> + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index 88001a295..d86db07e2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -154,40 +154,48 @@ $(document).ready(function(){
${log.foundTime }${log.recvTime } - - + + ${fns:abbr(log.capIp, 42)}${log.transProto } @@ -225,9 +230,22 @@ ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + + + + + + + + ${log.linkId } + + @@ -235,18 +253,22 @@ ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} ${log.addrList }${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - -<%-- --%> - - - - - - - - - - - - - + - + + + + + + + + @@ -216,46 +241,43 @@ $(document).ready(function(){ nat_main - - - - - - - + -<%-- + + + + + - -
${log.cfgId } ${log.cfgId } + + @@ -195,11 +203,28 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${fns:abbr(log.capIp, 42)}${log.transProto} - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} ${log.linkId } - - - + + + - - - + + + --%> -<%-- ${log.addrList} --%> - + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index df41858cf..c3acf7179 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -165,61 +165,84 @@
- - - - - - - - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
${log.cfgId} - - - - - - - - ${log.foundTime } - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -231,49 +254,43 @@ - - - - - - - - - - - - <%-- --%> - - - - - - - - - - -
${log.cfgId } + + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${log.chapName} ${fns:abbr(log.capIp, 42)}${log.transProto } - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} - - - - - - - - - - - - - - - ${log.addrList} - ${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
${page}
+ 		+ + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.userRegion}${log.sceneFile}
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index a03331554..c052f174c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -167,42 +167,50 @@ - - + + - + + + + + + + + - + - - - - - - - - + + + + + -<%-- --%> + + - - - - + + + + + - + + + + + + + + @@ -242,41 +267,39 @@ - + + + - - - - - - + + -<%-- + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index 63846dc45..25a309eb7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -165,47 +165,54 @@ $(document).ready(function(){
-
${log.cfgId } ${log.cfgId } + + @@ -211,10 +219,27 @@ ${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${fns:abbr(log.emlKey, 42)}${fns:abbr(log.capIp, 42)} - - ${logProtocol.itemValue} + + + + ${log.linkId } + + - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort }${log.deviceId } - + ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} --%> -<%-- ${log.addrList } --%> - + ${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - -<%-- --%> - - - - - - - - -<%-- --%> -<%-- --%> - -<%-- --%> - - - - - - - - - - - - - - + - + + + + + + + + @@ -256,44 +280,46 @@ $(document).ready(function(){ -<%-- --%> + + + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId } ${log.cfgId } + + @@ -213,11 +220,28 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.protocol}${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 2cfbe1c96..0eb89118f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -165,45 +165,53 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - -<%-- --%> - - - - - - - - -<%-- --%> -<%-- --%> - -<%-- --%> - - - - - - - - - - - - - + - + + + + + + + + @@ -254,44 +279,46 @@ $(document).ready(function(){ -<%-- --%> + + + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId } ${log.cfgId } + + @@ -211,11 +219,28 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.protocol}${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 0b0d2d29a..241c4b695 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -166,46 +166,53 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - -<%-- --%> - - - - - - - - -<%-- --%> -<%-- --%> - -<%-- --%> - - - - - - - - - - - - - - + - + + + + + + + + @@ -256,44 +280,46 @@ $(document).ready(function(){ -<%-- --%> + + + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId } ${log.cfgId } + + @@ -213,11 +220,28 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.protocol}${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index cd2d8c807..5a76a981b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -165,47 +165,53 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - - - - + - + + + + + + + + + - + - <%-- --%> + + + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId} + ${log.cfgId } - @@ -213,24 +219,41 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.pid} - + ${fn:substring(log.url,7,-1)} - ${log.url} + ${log.url} - http://${fn:substring(log.logUri,0,20) } - + - ${fns:stringFormat(log.referer,30)} + + ${log.referer} ${log.level} ${log.protocol}${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.transProto} - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} - - - - - - - - - - - - - - - ${fns:stringFormat(log.addrList,30)} - ${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index d349f3717..c6687ce72 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -162,47 +162,53 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - - - - + - + + + + + + + + @@ -241,61 +264,58 @@ $(document).ready(function(){ class="tooltips" data-flag="false" data-html="true" data-placement="top"> http://${fn:substring(log.logUri,0,20) } - + + - <%-- --%> + + + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId} + ${log.cfgId } - @@ -210,11 +216,28 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.referer} ${log.level} ${log.protocol}${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.transProto} - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} - - - - - - - - - - - - - - - ${log.addrList} - ${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index b1351da0d..92f54b627 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -165,45 +165,51 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - - - - - + + + + + + + + + + - - <%-- --%> + + + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId} + ${log.cfgId } @@ -212,11 +218,28 @@ $(document).ready(function(){ - ${log.foundTime}${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } - + @@ -233,22 +256,22 @@ $(document).ready(function(){ - - - - - -<%-- --%> -<%-- ${fn:substring(logUri,0,20)} --%> - - - ${fn:substring(logUri,0,20) } + ${fn:substring(log.logUri,0,20) } - <%-- ${log.logUri } - http://${log.logUri }'>http://${log.logUri } --%> + + + + + http://${fn:substring(log.logUri,0,20) } + + + + ${log.referer} ${log.referer} ${log.level} @@ -256,42 +279,46 @@ $(document).ready(function(){ ${log.protocol}${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index db33436db..fb6cdb57b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -165,47 +165,53 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - - - - + - + + + + + + + + - - + + - <%-- --%> + + + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId} + ${log.cfgId } - @@ -213,10 +219,27 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } - + @@ -233,62 +256,69 @@ $(document).ready(function(){ - - - - - - - ${fn:substring(logUri,0,20) } + ${fn:substring(log.logUri,0,20) } - <%-- ${log.logUri } - http://${log.logUri }'>http://${log.logUri } --%> + + + + + http://${fn:substring(log.logUri,0,20) } + + ${log.referer }${log.level } + ${log.referer} + ${log.level} ${log.protocol}${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index 173c631d4..b3662f6b9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -221,75 +221,97 @@
- - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId} - - - - - - - - ${log.foundTime} - - - - - - ${log.pid} - - ${fn:substring(log.url,7,-1)} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - -
${log.cfgId } + + + + + - - ${log.url} - - + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + @@ -304,57 +326,56 @@ ${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.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+ 		+ ${log.referer} + ${log.level} + + + + ${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.userRegion}${log.sceneFile}
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index e1aa7fcf0..08220f0e5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -165,136 +165,160 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - - <%-- --%> + + + - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - + + + http://${fn:substring(log.logUri,0,20) } + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - -
${log.cfgId } + + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + - + ${log.referer} + ${log.level} + + + + ${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.userRegion}${log.sceneFile}
${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.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+ + +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index 04c5eea9e..6eeb05e84 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -165,136 +165,160 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - - <%-- --%> + + + - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - + + + http://${fn:substring(log.logUri,0,20) } + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - -
${log.cfgId } + + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + - + ${log.referer} + ${log.level} + + + + ${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.userRegion}${log.sceneFile}
${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.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+ + +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index f1680fd92..e20e2bafa 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -164,136 +164,160 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - - <%-- --%> + + + - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - + + + http://${fn:substring(log.logUri,0,20) } + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - -
${log.cfgId } + + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + - + ${log.referer} + ${log.level} + + + + ${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.userRegion}${log.sceneFile}
${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.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+ + +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index 19be727e6..3e721ccc5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -165,136 +165,160 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - - <%-- --%> + + + - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - + + + http://${fn:substring(log.logUri,0,20) } + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - -
${log.cfgId } + + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + - + ${log.referer} + ${log.level} + + + + ${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.userRegion}${log.sceneFile}
${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.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+ + +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index ea087d3bd..941461032 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -165,138 +165,160 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - - <%-- --%> + + + - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - + + + http://${fn:substring(log.logUri,0,20) } + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - -
${log.cfgId } + + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + - + ${log.referer} + ${log.level} + + + + ${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate}${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.userRegion}${log.sceneFile}
${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.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+ + +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index aa5131e40..32d10d0f3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -165,54 +165,61 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - <%-- - - - --%> - - - - - - - - - - - - - <%-- - --%> - - <%-- --%> - - - - - - - - - - - - - + - + + + + + + + + - - - - <%-- - - - --%> - - + + + + + + + @@ -263,40 +286,43 @@ $(document).ready(function(){ + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId} + ${log.cfgId } - @@ -220,40 +227,56 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + ${log.duation} ${log.voipProtocol} ${log.callingAccount } ${log.calledAccount }${log.callingNumber }${log.calledNumber }${log.fromToStoreIp}${log.fromToStoreUrl }${log.toFromStoreIp}${log.toFromStoreUrl }${log.pid} - - - ${fn:substring(log.logUri,0,20) } - - - - - - http://${fn:substring(log.logUri,0,20) } - - + ${log.callingNumber}${log.calledNumber}${log.fromToStoreIp}${log.fromToStoreUrl}${log.toFromStoreIp}${log.toFromStoreUrl}${log.pid} + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + ${log.level} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index cfbe90294..f311fc626 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -165,52 +165,61 @@ $(document).ready(function(){
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - - - - - - - - - - - -<%-- --%> -<%-- --%> - -<%-- --%> - - - - - - - - - - - - - + - + + + + + + + + - - + -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - + + + + + @@ -262,42 +286,43 @@ $(document).ready(function(){ + + + + + + + - - - - - - -<%-- --%> - -<%-- --%> -<%-- --%> -<%-- --%> - - -<%-- + - -
${log.cfgId } ${log.cfgId } + + @@ -218,41 +227,56 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.duation} ${log.voipProtocol} ${log.callingAccount }${log.calledAccount } - ${log.calledAccount } ${log.callingNumber} ${log.calledNumber}${log.fromToStoreIp}${log.fromToStoreUrl}${log.toFromStoreIp}${log.toFromStoreUrl}${log.pid} - - - ${fn:substring(log.logUri,0,20) } - - - - - - http://${fn:substring(log.logUri,0,20) } - - + ${log.fromToStoreIp}${log.fromToStoreUrl}${log.toFromStoreIp}${log.toFromStoreUrl}${log.pid} + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + ${log.level} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 7bd2bb400..ea23b16a5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -164,53 +164,62 @@ $(document).ready(function(){
- - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - - - - - - - - - - - -<%-- --%> -<%-- --%> - -<%-- --%> - - - - - - - - - - - - - + - + + + + + + + + - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - + + + + + @@ -261,40 +286,43 @@ $(document).ready(function(){ + + + + + + + - - - - - - -<%-- --%> - <%-- --%> - - <%-- --%> + + - -
${log.cfgId } ${log.cfgId } + + @@ -218,40 +227,56 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${log.duation} ${log.voipProtocol} ${log.callingAccount } ${log.calledAccount } ${log.callingNumber} ${log.calledNumber}${log.fromToStoreIp}${log.fromToStoreUrl}${log.toFromStoreIp}${log.toFromStoreUrl}${log.pid} - - - ${fn:substring(log.logUri,0,20) } - - - - - - http://${fn:substring(log.logUri,0,20) } - - + ${log.fromToStoreIp}${log.fromToStoreUrl}${log.toFromStoreIp}${log.toFromStoreUrl}${log.pid} + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + ${log.level} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index fb4292b12..63e433375 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -164,40 +164,47 @@ $(document).ready(function(){
- - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - -<%-- --%> -<%-- --%> - -<%-- --%> - - - - - - - - - - - - - + - + + + + + + + + - - + + + + + + + - - - - - - - <%-- - --%> - - <%-- --%> + + - -
${log.cfgId } ${log.cfgId } + + @@ -205,15 +212,31 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + ${fn:substring(log.url,7,-1)} @@ -223,43 +246,43 @@ $(document).ready(function(){ ${log.protocol} + + + + ${log.linkId } + + + + + + + + ${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${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.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index 5917c2efc..5869a978f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -167,42 +167,51 @@ $(document).ready(function(){
- + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - -<%-- --%> - - - - - - - - - - - - - + - + + + + + + + + <%-- --%> + @@ -226,50 +253,47 @@ $(document).ready(function(){ - - - - - - - - - + - <%-- --%> - - + + + + + + + + - -
${log.cfgId } ${log.cfgId } + + @@ -210,11 +219,29 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort }${log.service } + + + TCP UDP ${fns:abbr(log.capIp, 42)}${log.transProto} - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} ${log.linkId } - - - + + + - - - + + + ${log.addrList }${log.serverLocate }${log.clientLocate }${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index 7ebb25c42..4ea6cfecb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -184,32 +184,38 @@ - - + + - - - - - - - - + + - + + + + + + + + + + + - <%-- --%> + + - - - - + + + + + @@ -227,6 +233,23 @@ + + + + + + + - - - - - - - + + + + - <%-- --%> + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index b10b2160f..783709e46 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -164,59 +164,81 @@
${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } @@ -239,20 +262,15 @@ ${log.p2pFileId} ${log.p2pKeyword}${fns:abbr(log.capIp, 42)}${log.transProto } - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + ${log.linkId } + + @@ -260,18 +278,22 @@ ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} ${log.addrList }${fns:abbr(log.capIp, 42)}${log.addrList } ${log.serverLocate} ${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
- - - - - - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -225,47 +247,43 @@ PAPCHAPMS-CHAP(v1/v2)EAP-TLS - - - - - - - - - - - - <%-- --%> - - - - - - - - - - -
${log.cfgId} - - - - - - - - ${log.foundTime } - - - - - - +
${log.cfgId } + + + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } + + + + + + ${fns:abbr(log.capIp, 42)}${log.transProto } - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} - - - - - - - - - - - - - - ${log.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
${page}
+ + + + + + ${log.linkId } + + + + + + + + + + + ${log.innerSmac } + ${log.innerDmac } + + + ${streamType.itemValue} + + + ${fns:abbr(log.capIp, 42)} + ${log.addrList } + ${log.serverLocate} + ${log.clientLocate} + ${log.sAsn} + ${log.dAsn} + ${log.sSubscribeId} + ${log.dSubscribeId} + ${log.userRegion} + ${log.sceneFile} + + + +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index c1153dfc0..4e764d692 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -167,44 +167,53 @@ $(document).ready(function(){
- + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - -<%-- --%> - - <%-- - - - --%> - - - - - - - - - - - -<%-- --%> - - - - - - - - - - - - - + - + + - - <%-- --%> - - <%-- - - --%> - <%-- --%> - - - - - + + + <%-- --%> + + + + + + + + - <%-- --%> - - + + + + + + + + - -
${log.cfgId } ${log.cfgId } + + @@ -212,28 +221,15 @@ $(document).ready(function(){ ${log.foundTime}${log.foundTime }${log.recvTime } - - - + + + ${log.version }${log.hostKey }${log.hostCookie }${log.encryptMode }${log.mac } - SSH - SSHD - SFTP - ${fns:abbr(log.capIp, 42)}${log.transProto} @@ -241,35 +237,63 @@ $(document).ready(function(){ ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort}${log.dPort }${log.sPort }${log.service } + + + + + + ${log.version }${log.hostKey }${log.hostCookie }${log.encryptMode }${log.mac } + SSH + SSHD + SFTP + ${log.linkId } - - - + + + - - - + + + ${log.addrList }${log.serverLocate }${log.clientLocate }${log.innerSmac }${log.innerDmac } + + ${streamType.itemValue} + + ${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}
+ +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index 795d1c23a..b9ba3dbf5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -173,105 +173,125 @@
- - - - - - - - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - - -
SNISANCN
${log.cfgId} - - - - - - - - ${log.foundTime } - - - - - - ${log.version }${log.sni }${log.san }${log.cn }${fns:abbr(log.capIp, 42)}${log.transProto } - - - - ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} - - - - - - - - - - - - - - ${log.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
${page}
+ + + + + + + + + + + + + + + + SNI + SAN + CN + + + + + + + + + + + + + + + + + + + + + + + + ${log.cfgId } + + + + + + + + + + ${log.foundTime } + ${log.recvTime } + + + + + + + + + + + + + ${fns:abbr(log.dIp, 42)} + ${fns:abbr(log.sIp, 42)} + ${log.dPort } + ${log.sPort } + + + + + + + + + ${log.version } + ${log.sni } + ${log.san } + ${log.cn } + + + + + + + ${log.linkId } + + + + + + + + + + + ${log.innerSmac } + ${log.innerDmac } + + + ${streamType.itemValue} + + + ${fns:abbr(log.capIp, 42)} + ${log.addrList } + ${log.serverLocate} + ${log.clientLocate} + ${log.sAsn} + ${log.dAsn} + ${log.sSubscribeId} + ${log.dSubscribeId} + ${log.userRegion} + ${log.sceneFile} + + + +
${page}
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index d80ccd413..9f268b359 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -154,36 +154,83 @@ - + + - - - - + + + - + + + + + + + + + + + + + + <%-- + --%> + + + + + + + - <%-- --%> + + - - - - + + + + + - + + + + + + + + + - - - - - - + ${log.url} + + + http://${log.url} + --%> + + + + + + + + + + + + + + + + - <%-- --%> - - + + + + +
URL         URL        
${log.cfgId } + ${log.cfgId } + + + + + + ${log.foundTime }${log.recvTime } + + + + + + + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort } @@ -191,43 +238,59 @@ - ${log.url} + ${log.url} <%-- - ${log.url} - - - http://${log.url} - --%> - ${fns:abbr(log.capIp, 42)}${log.transProto }${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort }${log.sPort }${log.reqLine }${log.resLine }${log.cookie }${log.referer }${log.userAgent }${log.contentLen }${log.contentType }${log.setCookie }${log.reqHeader }${log.respHeader }${log.website } ${log.linkId } - + + + + + ${log.innerSmac }${log.innerDmac } ${streamType.itemValue} ${log.addrList }${log.serverLocate }${log.clientLocate }${fns:abbr(log.capIp, 42)}${log.addrList }${log.serverLocate}${log.clientLocate} ${log.sAsn} ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId}${log.userRegion} ${log.sceneFile}