修复配置td title显示问题

http url界面增加配置来源信息

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

@@ -8,14 +8,12 @@ function changesel(){
 }
 </script>
 <div class="row"
-	style="scrolling:auto;z-index:999;position:relative;height: 25px; font-size: 18px; text-align: center; margin-top: 30px; margin-left: 20px; line-height: 30px;">
-	<div class="col-md-8">
-		<div class="form-group">
-			<label class="control-label col-md-3"><font color="red">*</font> <spring:message code="letter"/> </label>
-			<div class="col-md-6">
-
+	style="scrolling:auto;z-index:999;position:relative;height: 25px; font-size: 18px; text-align: center; margin-top: 30px;line-height: 30px;">
+		<div class="form-group" style="margin-left:5px">
+			<div class="col-md-12">
+			<label class=" "><font color="red">*</font> <spring:message code="letter"/> </label>
 				<select id="requestIsAudit" name="requestId" onchange="changesel()"
-					class="selectpicker field required form-control" data-live-search="true"
+					class="selectpicker field required form-control input-medium " data-live-search="true"
 					data-live-search-placeholder="search">
 					<option value=""><spring:message code="select" /></option>
 					<c:forEach items="${requestInfos}" var="requestInfo">
@@ -27,6 +25,5 @@ function changesel(){
 			</div>
 
 		</div>
-	</div>
 </div>
 <!--/row-->

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -487,15 +487,15 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -520,6 +520,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -527,6 +535,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -599,15 +608,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp

@@ -328,6 +328,7 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -335,7 +336,6 @@
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -343,6 +343,7 @@
 									<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
 									<th><spring:message code="auditor"/></th>
 									<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
+									<th><spring:message code="source_compile_id"/></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -361,6 +362,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -440,14 +449,6 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
 									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
@@ -455,6 +456,11 @@
 									<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.auditorName }</td>
 									<td><fmt:formatDate value="${indexCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>
+										<c:if test="${!(empty indexCfg.sourceCompileId )}">
+											${fns:getHttpBodyKeyword(indexCfg.sourceCompileId) }
+										</c:if>
+									</td>
 								</tr>
 								</c:forEach>
 							</tbody>

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

@@ -7,6 +7,13 @@
 </title>
 <script>
 	$(document).ready(function() {
+		 /* $('#contentTable thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+	    	  $('#contentTable tbody tr td input.i-checks').iCheck('check');
+	    	});
+
+	    $('#contentTable thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+	    	  $('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
+	    	}); */
 		//reset
 		$("#resetBtn").on("click",function(){
 			$("select.selectpicker").each(function(){
@@ -20,8 +27,23 @@
 			.attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		$("#logToUrl").on("click",function(){
+			var checkboxes=$("#contentTable tbody tr td input.i-checks:checkbox");
+			if($(checkboxes).filter(":checked").length>0){
+				$("#http_url_modal").modal({
+					backdrop:"static",
+					keyboard:false,
+					show:true
+				});
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+			}
+			
+		});
 		//筛选功能
 		filterActionInit();
+		
 	});
 </script>
 </head>
@@ -38,7 +60,7 @@
 		<div class="portlet">
 			<div class="portlet-body">
 				<div class="row" >
-					<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/http/list" method="post" class="form-search">
+					<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/httpkey/list" method="post" class="form-search">
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
@@ -84,6 +106,7 @@
                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
 							</div>
 							<div class="pull-right">
+								<button type="button" class="btn btn-default" id="logToUrl"> <spring:message code="log_to_url"/></button>
                                	<a class="btn btn-icon-only btn-default setfields tooltips" 
                                      	data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                     <i class="icon-wrench"></i>
@@ -175,6 +198,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
+								<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								<th><spring:message code='cfg_id'/></th>
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="found_time"/></th>
@@ -214,6 +238,7 @@
 						<tbody>
 							<c:forEach var="log" items="${page.list }">
 								<tr>
+									<td><a class="hidden"></a><input type="checkbox" class="i-checks child-checks" compileId="${log.cfgId }" url="${log.url}" value="${log.cfgId }"></td>
 									<td>${log.cfgId }
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
@@ -348,5 +373,7 @@
 		</div>
 	</div>
 </div>
+<!-- 转log to URL，start -->
+<%@include file="/WEB-INF/include/form/multiHttpUrlModal.jsp" %>
 </body>
 </html>

src/main/webapp/static/global/scripts/common.js

@@ -36,18 +36,18 @@ $(function(){
 	$("#contentTable").not(".logTb").find("td").each(function(i){
 	     //获取td当前对象的文本,如果长度大于25;  
 	     if($(this).text().trim().length>28){  
-	            //给td设置title属性,并且设置td的完整值.给title属性.
-	    	 var strTitle = $(this).text().trim();
-	    		//解决火狐title不能自动换行
-	    		var count = Math.floor(strTitle.length/64);
-	    		for(var i=1;i<=count;i++){
-	    			strTitle=strTitle.substring(0,i*64-1)+"\n"+strTitle.substring(i*64-1);
-	    		}
+	        //给td设置title属性,并且设置td的完整值.给title属性.
+	    	var strTitle = $(this).text().trim();
+    		//解决火狐title不能自动换行
+    		var count = Math.floor(strTitle.length/64);
+    		for(var i=1;i<=count;i++){
+    			strTitle=strTitle.substring(0,i*64-1)+"\n"+strTitle.substring(i*64-1);
+    		}
 			$(this).attr("title",strTitle);  
-	            //获取td的值,进行截取。赋值给text变量保存.  
-			var text=$(this).text().substring(0,25)+"...";
-	            //重新为td赋值;  
-	            $(this).text(text);  
+            //获取td的值,进行截取。赋值给text变量保存.  
+			var text=$(this).text().trim().substring(0,25)+"...";
+            //重新为td赋值;  
+            $(this).text(text);  
 	     }  
 	  });
 	
@@ -1586,7 +1586,28 @@ var setHexCaseSenstive=function(){
 		
 	});
 }
-
+var validateEffectiveRuleLimit=function(path,serviceId){
+	var flag = true;
+	$.ajax({
+		url: path+"/configure/statistics/getEffectiveCfgNum",
+		type: "POST",
+		data:{"serviceId":serviceId},
+		async: false, //表单提交前验证是否可提交，所以此参数必须为false
+		success: function(data) {
+			if(data.status==0){
+				top.$.jBox.closeTip();
+				alertx(data.msg);
+    			flag=false;
+			}
+		},
+		error:function(jqXHR, textStatus, errorThrown){ 
+			top.$.jBox.closeTip();
+			alertx(errorThrown);
+			flag=false;
+		} 
+	});
+	return flag;
+}
 function heightDiv(type){
 	var hei=document.documentElement.clientHeight;
 	hei=hei-91;