Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

into develop

Conflicts:
	src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
去掉所有日志界面关于ip的悬浮查看（已有公共方法处理）

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<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 			List<CodeResult> appList = CodeDicUtils.getCodeList("appCode");
 			List<CodeResult> protocolList = CodeDicUtils.getCodeList("protocolCode");
-			List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
+			//查询domainId
+			List<WebsiteDomainTopic> 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<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 			List<CodeResult> appList = CodeDicUtils.getCodeList("appCode");
 			List<CodeResult> protocolList = CodeDicUtils.getCodeList("protocolCode");
-			List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
+			//List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
+			//查询domainId
+			List<WebsiteDomainTopic> 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<WebsiteDomainTopic> 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;
+	}
 
 }

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
+application_layer_protocol=Protocol

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

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){

src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp

@@ -346,7 +346,7 @@ $(document).ready(function(){
 									<%-- <td>
 												${log.labelAppSource}
 									</td> --%>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 										<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -365,8 +365,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/appList.jsp

@@ -275,7 +275,7 @@ $(document).ready(function(){
 									<td>
 												${log.labelAppSource}
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -294,8 +294,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									

src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp

@@ -292,7 +292,7 @@
 										</c:forEach>
 										<spring:message code="${entrances}"/>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -311,8 +311,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp

@@ -198,7 +198,7 @@ $(document).ready(function(){
 									<td>${log.pid }</td>
 									<td><fmt:formatDate value="${log.foundTime }" pattern="yyyy-MM-dd HH:mm:ss" /></td>
 									<td><fmt:formatDate value="${log.recvTime }" pattern="yyyy-MM-dd HH:mm:ss" /></td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>${log.voipProtocol }</td>
 									<td>${log.rtpDIp }</td>
 									<td>${log.rtpSIp }</td>

src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp

@@ -128,7 +128,8 @@
 						<input id="protos"  type="hidden" value="${log.protoId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
-						<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
+						<sys:tableSort id="orderBy" name="orderBy.
+						" value="${page.orderBy}" callback="page();" />
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 						<%-- 	<div class="pull-left">
@@ -287,7 +288,7 @@
                                 		<label class="control-label"><spring:message code='Web'/>：</label>
 										<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
 											<c:forEach items="${webList}" var="web" >
-												<option value="${web.id}"><spring:message code="${web.domain}"></spring:message></option>
+												<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
 											</c:forEach>
 										</select> 
 									</div>
@@ -322,20 +323,6 @@
 										<input name="dAsn" type="text" class="form-control" value="${log.dAsn }"/>
 									</div>
 								</div>
-								
-								<div class="col-md-4">
-									<div class="form-group">
-										<label><spring:message code="s_subscribe_id"></spring:message>：</label>
-										<input name="sSubscribeId" type="text" class="form-control" value="${log.sSubscribeId }"/>
-									</div>
-								</div>
-								
-								<div class="col-md-4">
-									<div class="form-group">
-										<label><spring:message code="d_subscribe_id"></spring:message>：</label>
-										<input name="dSubscribeId" type="text" class="form-control" value="${log.dSubscribeId }"/>
-									</div>
-								</div>
 
 						</div>
 						</div>
@@ -437,8 +424,8 @@
 									<td>
 										<c:set var="webIds">${log.webId }</c:set>
 										<c:forEach items="${webList}" var="dict">
-											<c:if test="${dict.id eq log.webId}">
+											<c:if test="${dict.code eq log.webId}">
-												<c:set var="webIds">${dict.domain}</c:set>
+												<c:set var="webIds">${dict.item}</c:set>
 											</c:if>
 										</c:forEach>
 										<spring:message code="${webIds}"/>

src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp

@@ -324,7 +324,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 					                	<spring:message code="${isBlocks}"/>
 									</td> 
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -343,8 +343,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp

@@ -365,7 +365,7 @@
 					                	</c:forEach>
 					                	<spring:message code="${dnsSubs}"/>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -384,8 +384,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp

@@ -320,7 +320,7 @@ $(document).ready(function(){
 									<td>
 										${log.ftpContent}
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -339,8 +339,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp

@@ -350,7 +350,7 @@
 												</c:if> --%>
 									</td>
 									<td>${log.website }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -369,8 +369,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp

@@ -408,7 +408,7 @@
 									</c:if>
 									</td>
 									<td>${log.website }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td>${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -427,8 +427,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td>${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td>${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp

@@ -288,7 +288,7 @@
 										</c:forEach>
 										<spring:message code="${entrances}"/>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -307,8 +307,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp

@@ -234,7 +234,7 @@ $(document).ready(function(){
 										<c:if test="${log.isakmpMode==3}">nat_aggre</c:if>
 										<c:if test="${log.isakmpMode==4}">nat_main</c:if>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -253,8 +253,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp

@@ -269,7 +269,7 @@
 									<td>${log.c2sByteNum }</td>
 									<td>${log.s2cByteNum }</td>
 									
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -288,8 +288,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp

@@ -268,7 +268,7 @@
 									<td>${log.c2sByteNum }</td>
 									<td>${log.s2cByteNum }</td>
 									
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -287,8 +287,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp

@@ -246,7 +246,7 @@
 											<td>
 												${log.chapName}
 											</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -266,8 +266,8 @@
 				               			<spring:message code="${addrTypes}"/>
 									</td>
 
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>		
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp

@@ -342,7 +342,7 @@
 										</c:if>
 									</td>
 									<td title="${log.emlKey }">${fns:abbr(log.emlKey, 42)}</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -361,8 +361,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp

@@ -287,7 +287,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -306,8 +306,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									

src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp

@@ -283,7 +283,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -302,8 +302,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp

@@ -342,7 +342,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 				               		</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -361,8 +361,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp

@@ -284,7 +284,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -303,8 +303,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp

@@ -282,7 +282,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -301,8 +301,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp

@@ -284,7 +284,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -303,8 +303,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp

@@ -344,7 +344,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 				               		</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -364,8 +364,8 @@ $(document).ready(function(){
 				               			<spring:message code="${addrTypes}"/>
 									</td>
 
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp

@@ -394,7 +394,7 @@
 											</c:if>
 				               			</c:forEach>
 				               			${avProtocol }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -413,8 +413,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp

@@ -325,7 +325,7 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			${avProtocol }
 				               		</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -345,8 +345,8 @@ $(document).ready(function(){
 				               			<spring:message code="${addrTypes}"/>
 									</td>
 
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp

@@ -323,7 +323,7 @@ $(document).ready(function(){
 											</c:if>
 				               			</c:forEach>
 				               			${avProtocol }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -342,8 +342,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp

@@ -342,7 +342,7 @@ $(document).ready(function(){
 											</c:if>
 				               			</c:forEach>
 				               			${avProtocol }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -361,8 +361,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp

@@ -325,7 +325,7 @@ $(document).ready(function(){
 											</c:if>
 				               			</c:forEach>
 				               			${avProtocol }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -344,8 +344,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp

@@ -343,7 +343,7 @@ $(document).ready(function(){
 											</c:if>
 				               			</c:forEach>
 				               			${avProtocol }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
@@ -363,8 +363,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp

@@ -339,7 +339,7 @@ $(document).ready(function(){
 										</c:forEach>
 										<spring:message code="${fdTypes}"/>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -358,8 +358,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp

@@ -280,7 +280,7 @@ $(document).ready(function(){
 										</c:forEach>
 										<spring:message code="${fdTypes}"/>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -299,8 +299,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp

@@ -352,7 +352,7 @@ $(document).ready(function(){
 										</c:forEach>
 										<spring:message code="${fdTypes}"/>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 										<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -371,8 +371,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp

@@ -305,7 +305,7 @@ $(document).ready(function(){
 									</td>
 									<td>${log.protocol}</td>
 									
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -324,8 +324,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp

@@ -284,7 +284,7 @@ $(document).ready(function(){
 										<c:if test="${log.tunnelType==1}">TCP</c:if>
 										<c:if test="${log.tunnelType==2}">UDP</c:if>
 									</td> --%>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -303,8 +303,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp

@@ -298,7 +298,7 @@
 									<td>${log.p2pProto}</td>
 									<td>${log.p2pFileId}</td>
 									<td>${log.p2pKeyword}</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -318,8 +318,8 @@
 				               			<spring:message code="${addrTypes}"/>
 									</td>
 
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp

@@ -239,7 +239,7 @@
 												<c:if test="${log.encryptMode eq 3}">PAP</c:if><c:if test="${log.encryptMode eq 4}">CHAP</c:if>
 												<c:if test="${log.encryptMode eq 5}">MS-CHAP(v1/v2)</c:if><c:if test="${log.encryptMode eq 6}">EAP-TLS</c:if>
 											</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -258,8 +258,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp

@@ -295,7 +295,7 @@
 									<td>${log.framedIp }</td>
 									<td>${log.account }</td>
 									
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -314,8 +314,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp

@@ -247,7 +247,7 @@ $(document).ready(function(){
 										<c:if test="${log.tunnelType==2}">SSHD</c:if>
 										<c:if test="${log.tunnelType==3}">SFTP</c:if>
 									</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -266,8 +266,8 @@ $(document).ready(function(){
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp

@@ -318,7 +318,7 @@
 									<td>${log.sni }</td>
 									<td>${log.san }</td>
 									<td>${log.cn }</td>
-									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td >${log.capIp}</td>
 									
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
@@ -338,8 +338,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -328,7 +328,7 @@
 								<td>${log.respHeader }</td> --%>
 								
 								
-								<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+								<td >${log.capIp}</td>
 								<td>
 										<c:set var="transProtos">${log.transProto }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -347,8 +347,8 @@
 				               			</c:forEach>
 				               			<spring:message code="${addrTypes}"/>
 									</td>
-									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td >${log.dIp}</td>
-									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
 									<td>

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; }

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) {