摘要和voip日志 loguri管理员才能查看

YSP样例配置界面增加提示信息；
radius日志列表更改
国际化更新

src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp

@@ -313,6 +313,7 @@ function sampleFileValidate(fileType,fileName){
 		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	
+	
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
@@ -446,7 +447,11 @@ function sampleFileValidate(fileType,fileName){
 							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
 							            <div for="srcFileInfo"></div>
 							            <div id="fileErrorNote"></div>
+							            
 							        </div>
+							        <div style="margin-bottom:5px">
+							            <span style="color: red;font-size: 16px;letter-spacing: 0px;"> <spring:message code="av_tips"></spring:message></span>
+							            </div>
 							    </div>
 							    <%-- <div class="col-md-6">
 							        <div class="form-group">

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

@@ -219,7 +219,7 @@ $(document).ready(function(){
 								
 								<th class="sort-column pid" isVisible="false"><spring:message code='pid'/></th>
 								<th class="sort-column url"><spring:message code='access_url'/></th>
-								<th class="sort-column log_uri"><spring:message code='log_uri'/></th>
+								<%-- <th class="sort-column log_uri"><spring:message code='log_uri'/></th> --%>
 								<th class="sort-column referer"><spring:message code='referer'/></th>
 								<th class="sort-column level"  isVisible="false"><spring:message code='harm_level'/></th>
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>
@@ -289,7 +289,7 @@ $(document).ready(function(){
 											${log.url}
 										</c:if>
 									</td>
-									<td>
+									<%-- <td>
 										<c:if test="${fn:startsWith(log.logUri, 'http')}">
 											<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -303,7 +303,7 @@ $(document).ready(function(){
 											http://${fn:substring(log.logUri,0,20) }
 										</a>
 										</c:if>	
-									</td>
+									</td> --%>
 									<td>
 										${log.referer}
 									</td>

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

@@ -223,12 +223,14 @@ $(document).ready(function(){
 								<th class="sort-column called_account"><spring:message code='called_account'/></th>
 								<th class="sort-column calling_number" isVisible="false"><spring:message code='calling_number'/></th>
 								<th class="sort-column called_number" isVisible="false"><spring:message code='called_number'/></th>
- 								<c:if test="${fns:getUser().isAdmin()}"><th><spring:message code='from_to_store_ip'/></th>
+ 								<c:if test="${fns:getUser().isAdmin()}">
+ 								<th><spring:message code='from_to_store_ip'/></th>
  								<th><spring:message code='from_to_store_url'/></th>
  								<th><spring:message code='to_from_store_ip'/></th>
- 								<th><spring:message code='to_from_store_url'/></th></c:if>
+ 								<th><spring:message code='to_from_store_url'/></th>
+ 								</c:if>
  								<th class="sort-column pid" isVisible="false"><spring:message code='pid'/></th>
- 								<%-- <th class="sort-column log_uri"><spring:message code='log_uri'/></th> --%>
+ 								<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column log_uri"><spring:message code='log_uri'/></th></c:if>
  								<th class="sort-column level"  isVisible="false"><spring:message code='harm_level'/></th>
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>
  								 
@@ -293,12 +295,15 @@ $(document).ready(function(){
 									<td>${log.calledAccount }</td>
 									<td>${log.callingNumber}</td>
 									<td>${log.calledNumber}</td>
- 									<c:if test="${fns:getUser().isAdmin()}"><td>${log.fromToStoreIp}</td> 
+ 									<c:if test="${fns:getUser().isAdmin()}">
+ 									<td>${log.fromToStoreIp}</td> 
  									<td>${log.fromToStoreUrl}</td> 
  									<td>${log.toFromStoreIp}</td>
- 									<td>${log.toFromStoreUrl}</td></c:if>
+ 									<td>${log.toFromStoreUrl}</td>
+ 									</c:if>
  									<td>${log.pid}</td>
- 									<c:if test="${fns:getUser().isAdmin()}"><td>
+ 									<c:if test="${fns:getUser().isAdmin()}">
+ 									<td>
 										<c:if test="${fn:startsWith(log.logUri, 'http')}">
 											<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -312,7 +317,8 @@ $(document).ready(function(){
 											http://${fn:substring(log.logUri,0,20) }
 										</a>
 										</c:if>	
-									</td></c:if>
+									</td>
+									</c:if>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<td>

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

@@ -58,7 +58,7 @@
 						" value="${page.orderBy}" callback="page();" />
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
-							<div class="pull-left">
+						<%-- 	<div class="pull-left">
 									<form:select path="service" class="selectpicker select2 input-small">
 									<form:option value=""><spring:message code="action"/></form:option>
 									<c:forEach items="${serviceList}" var="service"
@@ -70,7 +70,7 @@
 										</c:forEach>
 									</c:forEach>
 								</form:select>
-							</div>
+							</div> --%>
 							<div class="pull-left">
 								<div class="input-group">
                                 	<div class="input-group-btn">

src/main/webapp/WEB-INF/views/login.jsp

@@ -213,7 +213,7 @@
 			$("body").height(bodyHeight+"px");
 			$("#ntc_chart").height((bodyHeight-200)+"px");
 			$("#ntc_chart").width($(".main_left").width()+"px");
-			var lineheight_y = 346;
+			var lineheight_y = 485;
 			var lineheight_y2 = 724;
 			var lineheight_x2 = 761;
 			var lineheight_x = 346;

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js

@@ -81,6 +81,6 @@
 		areaUnique:"Area already exists.",
 		config_sync_tip:"The system is being maintained and temporarily inaccessible.",
 		ipMaskSole:"IP already exists.",
-		noStrategyCheck:"No effective spoofing IP configuration under default group."
+		noStrategyCheck:"No effective spoofing IP configuration"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js

@@ -81,6 +81,6 @@
 		areaUnique:"Регион уже существует.",
 		config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.",
 		ipMaskSole:"IP уже существует.",
-		noStrategyCheck:"No effective spoofing IP configuration under default group."
+		noStrategyCheck:"No effective spoofing IP configuration"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

@@ -81,6 +81,6 @@
 		areaUnique:"该区域已存在",
 		config_sync_tip:"系统正在维护中，暂时不可访问！",
 		ipMaskSole:"IP已存在",
-		noStrategyCheck:"缺省组下无有效的欺骗IP配置"
+		noStrategyCheck:"策略组下无有效的欺骗IP配置"
 	});
 }(jQuery));