diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java index 4bf4a08d6..79f176539 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java @@ -22,6 +22,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.SysUser; +import com.nis.domain.configuration.WebsiteDomainTopic; import com.nis.domain.log.NtcConnRecordLog; import com.nis.domain.maat.LogRecvData; import com.nis.exceptions.MaatConvertException; @@ -71,11 +72,19 @@ public class NtcConnRecordLogController extends BaseController { params.put("searchClientLocate", log.getClientLocate()); } + if (StringUtils.isNotBlank(log.getsSubscribeId())) { + params.put("searchSSubscribeId", log.getsSubscribeId()); + } + if (StringUtils.isNotBlank(log.getdSubscribeId())) { + params.put("searchDSubscribeId", log.getdSubscribeId()); + } + List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); model.addAttribute("serviceList", serviceList); List appList = CodeDicUtils.getCodeList("appCode"); List protocolList = CodeDicUtils.getCodeList("protocolCode"); - List webList = CodeDicUtils.getCodeList("webCode"); + //查询domainId + List webList = appCfgService.getDomainDict(new WebsiteDomainTopic()); model.addAttribute("appList", appList); model.addAttribute("protocolList", protocolList); @@ -184,11 +193,21 @@ public class NtcConnRecordLogController extends BaseController { if (StringUtils.isNotBlank(log.getClientLocate())) { params.put("searchClientLocate", log.getClientLocate()); } + if (StringUtils.isNotBlank(log.getsSubscribeId())) { + params.put("searchSSubscribeId", log.getsSubscribeId()); + } + if (StringUtils.isNotBlank(log.getdSubscribeId())) { + params.put("searchDSubscribeId", log.getdSubscribeId()); + } + List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); model.addAttribute("serviceList", serviceList); List appList = CodeDicUtils.getCodeList("appCode"); List protocolList = CodeDicUtils.getCodeList("protocolCode"); - List webList = CodeDicUtils.getCodeList("webCode"); + //List webList = CodeDicUtils.getCodeList("webCode"); + //查询domainId + List webList = appCfgService.getDomainDict(new WebsiteDomainTopic()); + model.addAttribute("appList", appList); model.addAttribute("protocolList", protocolList); model.addAttribute("webList", webList); @@ -214,7 +233,7 @@ public class NtcConnRecordLogController extends BaseController { l.setProtoId(getName(l.getProtoId(),protocolList,msgProp)); } if (StringUtils.isNotBlank(l.getWebId())) { - l.setWebId(getName(l.getWebId(),webList,msgProp)); + l.setWebId(getWebName(l.getWebId(),webList,msgProp)); } if (StringUtils.isNotBlank(l.getC2sPktNum()) && StringUtils.isNotBlank(l.getS2cPktNum()) ) { l.setTotalPkt(String.valueOf(Integer.valueOf(l.getC2sPktNum())+Integer.valueOf(l.getS2cPktNum()))); @@ -260,5 +279,16 @@ public class NtcConnRecordLogController extends BaseController { } return name; } + + public String getWebName(String id,List list,Properties msgProp){ + String name=String.valueOf(id); + for (int i = 0; i < list.size(); i++) { + if(String.valueOf(id).equals(list.get(i).getId())){ + name=msgProp.getProperty(list.get(i).getDomain(),list.get(i).getDomain()); + break; + } + } + return name; + } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 9721fec49..98d15c5b0 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1132,7 +1132,7 @@ report_total=Total message_type=Message Type as=AS route=Route -transport_layer_protocol=Protocol +transport_layer_protocol=Trans Protocol av_voip_monit=VoIP Monitor av_voip_reject=VoIP Block label_proto_source=Protocol Source @@ -1361,7 +1361,7 @@ nas_ip=NAS IP Address framed_ip=Framed IP Address log_user_name=User Name av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P. -asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.) +asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.) keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration. conn_record=Connection Records bps=Gbps @@ -1457,4 +1457,4 @@ country_code=Country Code asn_name=ASN Name details=Details NTC_ASN_NUMBER=ASN -application_layer_protocol=AppProto \ No newline at end of file +application_layer_protocol=Protocol diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index e9f05d3c7..279f912aa 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1132,7 +1132,7 @@ report_total=\u0412\u0441\u0435\u0433\u043e message_type=\u0422\u0438\u043f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f as=\u041a\u0410\u041a route=\u041c\u0430\u0440\u0448\u0440\u0443\u0442 -transport_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b +transport_layer_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u0422\u0440\u0430\u043D\u0441\u043F\u043E\u0440\u0442\u043D\u043E\u0433\u043E \u0423\u0440\u043E\u0432\u043D\u044F av_voip_monit=\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433 VoIP av_voip_reject=VoIP \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 label_proto_source=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430 @@ -1461,4 +1461,4 @@ country_code=Country Code asn_name=ASN Name details=Details NTC_ASN_NUMBER=ASN -application_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 +application_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp index ded7fa5a9..354c3b9a4 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp @@ -561,7 +561,7 @@ // verticalAlign: 'middle' // }, series: [{ - name: 'server', + name: 'Client IP', data: (function () { var data = []; if(sipResult!=null&&sipResult.length>0){ @@ -584,7 +584,7 @@ }()) }, { - name: 'client', + name: 'Server IP', data: (function () { var data = []; if(dipResult!=null&&dipResult.length>0){ 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 0dadadcb9..ef4319389 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -346,7 +346,7 @@ $(document).ready(function(){ <%-- ${log.labelAppSource} --%> - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -365,8 +365,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 2a5a053eb..142e24d1d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -275,7 +275,7 @@ $(document).ready(function(){ ${log.labelAppSource} - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -294,8 +294,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 20e2742d6..6c5592ac8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -292,7 +292,7 @@ - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -311,8 +311,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp index 8de4c5521..eca918a74 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp @@ -198,7 +198,7 @@ $(document).ready(function(){ ${log.pid } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.voipProtocol } ${log.rtpDIp } ${log.rtpSIp } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp index dd383b531..1fb6d7aa5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp @@ -128,7 +128,8 @@ - +
<%--
@@ -287,7 +288,7 @@
@@ -322,20 +323,6 @@
- -
-
- - -
-
- -
-
- - -
-
@@ -437,8 +424,8 @@ ${log.webId } - - ${dict.domain} + + ${dict.item} 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 4c2171a28..2b98a6716 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -324,7 +324,7 @@ $(document).ready(function(){ - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -343,8 +343,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 0bd98ffce..6a113d037 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -365,7 +365,7 @@ - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -384,8 +384,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 c09c1fc7c..d65a4d7a0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -320,7 +320,7 @@ $(document).ready(function(){ ${log.ftpContent} - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -339,8 +339,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 d536236bf..a3c39b3b3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -350,7 +350,7 @@ --%> ${log.website } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -369,8 +369,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 e9a15517f..23a4cb7fd 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -408,7 +408,7 @@ ${log.website } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -427,8 +427,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 b7f70f74f..29754bfdf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -288,7 +288,7 @@ - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -307,8 +307,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 07c53c97c..9a7c44853 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -234,7 +234,7 @@ $(document).ready(function(){ nat_aggre nat_main - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -253,8 +253,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp index 6f4be31a7..01c836072 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp @@ -269,7 +269,7 @@ ${log.c2sByteNum } ${log.s2cByteNum } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -288,8 +288,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp index 3b8b65304..07eb7fb49 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp @@ -268,7 +268,7 @@ ${log.c2sByteNum } ${log.s2cByteNum } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -287,8 +287,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 d4202a40e..3f4b6d07f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -246,7 +246,7 @@ ${log.chapName} - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -266,8 +266,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 ebab37115..ec4dcfde4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -342,7 +342,7 @@ ${fns:abbr(log.emlKey, 42)} - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -361,8 +361,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 78fb7da53..300a01d96 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -287,7 +287,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -306,8 +306,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 671219b7d..406135222 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -283,7 +283,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -302,8 +302,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 ce366910b..9906964b5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -342,7 +342,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -361,8 +361,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 a6233bba6..c8a685d04 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -284,7 +284,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -303,8 +303,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 eec128b4a..1f1eaffa1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -282,7 +282,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -301,8 +301,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 f51641098..fc30870ec 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -284,7 +284,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -303,8 +303,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 99e3cde13..aa47b3ff9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -344,7 +344,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -364,8 +364,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 97c1428c8..1a40bee37 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -394,7 +394,7 @@ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -413,8 +413,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 7fca78f8e..453cc9c66 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -325,7 +325,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -345,8 +345,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 5774a24f8..34fb3f011 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -323,7 +323,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -342,8 +342,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 e75c4e36c..303c27a46 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -342,7 +342,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -361,8 +361,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 dbbf7e3bc..a57d3c474 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -325,7 +325,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -344,8 +344,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 9de207ee7..f1ca51ec0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -343,7 +343,7 @@ $(document).ready(function(){ ${avProtocol } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -363,8 +363,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 b7a48d297..4348bed68 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -339,7 +339,7 @@ $(document).ready(function(){ - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -358,8 +358,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 68daef22d..c53cc8e4f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -280,7 +280,7 @@ $(document).ready(function(){ - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -299,8 +299,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 ae6c7a6ef..3ae5ad9a4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -352,7 +352,7 @@ $(document).ready(function(){ - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -371,8 +371,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 715d455cc..bade0bf5e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -305,7 +305,7 @@ $(document).ready(function(){ ${log.protocol} - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -324,8 +324,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 e23b5a067..b8bfcd4f9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -284,7 +284,7 @@ $(document).ready(function(){ TCP UDP --%> - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -303,8 +303,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 e27afc35e..2ec66a1f9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -298,7 +298,7 @@ ${log.p2pProto} ${log.p2pFileId} ${log.p2pKeyword} - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -318,8 +318,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 16c3217ea..25d147280 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -239,7 +239,7 @@ PAPCHAP MS-CHAP(v1/v2)EAP-TLS - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -258,8 +258,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp index 2246144d1..5e65e2bb6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp @@ -295,7 +295,7 @@ ${log.framedIp } ${log.account } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -314,8 +314,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 23f17ef05..d88889b5f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -247,7 +247,7 @@ $(document).ready(function(){ SSHD SFTP - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -266,8 +266,8 @@ $(document).ready(function(){ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 17d3c0d9f..d945b17a1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -318,7 +318,7 @@ ${log.sni } ${log.san } ${log.cn } - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -338,8 +338,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } 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 054ead867..b4ef1f4de 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -328,7 +328,7 @@ ${log.respHeader } --%> - ${fns:abbr(log.capIp, 42)} + ${log.capIp} ${log.transProto } @@ -347,8 +347,8 @@ - ${fns:abbr(log.dIp, 42)} - ${fns:abbr(log.sIp, 42)} + ${log.dIp} + ${log.sIp} ${log.dPort } ${log.sPort } diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index c1ef22272..e42876c74 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -5881,7 +5881,7 @@ Custom color buttons width: 145px !important; } .input-medium { - width: 240px !important; } + width: 200px !important; } .input-large { width: 320px !important; } diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js index 385f3e2dd..a0438664b 100644 --- a/src/main/webapp/static/pages/scripts/pageLogs.js +++ b/src/main/webapp/static/pages/scripts/pageLogs.js @@ -120,7 +120,7 @@ function aJaxImportPost(url, params) { // 设置form属性 temp_form .action = url; temp_form .target = "_self"; - temp_form .method = "post"; + temp_form .method = "post"; R temp_form .style.display = "none"; // 处理需要传递的参数 for (var x in params) {