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

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -232,6 +232,23 @@ function cancelPassOpt(url){
 		 			});
 				}
 			}
+			if(canCancel){
+				//查询证书是否被拦截策略引用
+				if(compileIds.length > 0){
+					$.ajax({
+		 				type:'post',
+		 				url:'${ctx}/proxy/intercept/strateagy/ajaxKeyinfIsUsed',
+		 				data:{"compileIds":compileIds.join(',')},
+		 				async:false,
+		 				success:function(data){//处理返回结果
+		 					if(data == false){
+		 						top.$.jBox.tip('<spring:message code="keyring_is_used"/>');
+		 						canCancel=data;
+		 					}
+		 				}
+		 			});
+				}
+			}
 			
 			if(canCancel){
 				doAll(checkboxes,url);

src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp

@@ -104,6 +104,23 @@ label.errorShow {
 				return flagLeafChange;
 			},"<spring:message code='leafChange'/>");
 			
+			
+			//校验ip是否重复
+			jQuery.validator.addMethod("ipRepeat",function(value,element){
+				var flagLeafChange=false;
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/basics/serviceDictInfo/ajaxIpRepeat',
+					data:{oldIp:"${serviceDictInfo.itemValue}",ip:$("#itemValue").val(),type:5},
+					success:function(data){
+						flagLeafChange=data;
+					}
+				});
+				return flagLeafChange;
+			},"<spring:message code='ip_existed'/>");
+			
+			
 			jQuery.validator.addMethod("ipchecks",function(value,element){
 				var tel=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/;
 				 return this.optional(element) || (tel.test(value));
@@ -252,7 +269,7 @@ label.errorShow {
 								</label>
 								<div class="col-md-4">
 								<c:if test="${itType==5 }">
-										 <input class="form-control required ipchecks "  id="itemValue"  type="text" name="itemValue" value="${serviceDictInfo.itemValue}">
+										 <input class="form-control required ipchecks  ipRepeat"  id="itemValue"  type="text" name="itemValue" value="${serviceDictInfo.itemValue}">
 								</c:if>
 								<c:if test="${itType!=5 }">
 										<form:input path="itemValue" htmlEscape="false"  maxlength="64" class="form-control required "/>

src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp

@@ -321,7 +321,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td>
-										<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
+										<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId }" compileId="${cfg.compileId }" id="${cfg.cfgId}" value="${cfg.isAudit}">
 									</td>
 									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>

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

@@ -140,8 +140,7 @@
 						<input id="isps"  type="hidden" value="${log.ispCode}"/>
 						<!-- 筛选按钮展开状态-->
 						<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">
@@ -391,6 +390,7 @@
 								<th class="sort-column s_ip" column="client_ip"><spring:message code="client_ip"/></th>
 								<th class="sort-column d_port" column="server_port"><spring:message code="server_port"/></th>
 								<th class="sort-column s_port" column="client_port"><spring:message code="client_port"/></th>
+								<th class="sort-column device_id" column="isp"><spring:message code="isp"/></th>
 								
 								<th class="sort-column s2c_pkt_num" column="s2c_pkt_num"><spring:message code='s2c_pkt_num'/></th>
 								<th class="sort-column c2s_pkt_num" column="c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th>
@@ -505,6 +505,7 @@
 									<td >${log.sIp}</td>
 									<td>${log.dPort }</td>
 									<td>${log.sPort }</td>
+									<td>${log.ispName }</td>
 									
 									<td>${log.s2cPktNum }</td>
 									<td>${log.c2sPktNum }</td>