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

YSP样例配置界面增加提示信息； radius日志列表更改国际化更新
2018-12-13 09:31:31 +08:00
parent d944c1a294
commit 3d371d12ce
12 changed files with 46 additions and 27 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1359,8 +1359,9 @@ log_search_http_monit=HTTP Monitor
 log_search_http_reject=HTTP Block
 log_search_keyword_monit=Keyword Monitor
 log_search_keyword_reject=Keyword Block
-radius_log=RADIUS Identify
-message_type=Message Type
+radius_log=Radius Identify
+message_type=Code
 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.
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1363,3 +1363,9 @@ log_search_http_monit=HTTP \u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043
 log_search_http_reject=HTTP \u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 log_search_keyword_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u041A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0421\u043B\u043E\u0432
 log_search_keyword_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u041A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0421\u043B\u043E\u0432
+radius_log=Radius Identify
+message_type=Code
+nas_ip=NAS IP Address
+framed_ip=Framed IP Address
+log_user_name=User Name
+av_tips=\u041A\u043E\u0433\u0434\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0446\u0435 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0431\u043E\u043B\u0435\u0435 1080p., \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F.
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1359,8 +1359,9 @@ log_search_http_monit=HTTP\u76D1\u6D4B
 log_search_http_reject=HTTP\u963B\u65AD
 log_search_keyword_monit=\u5173\u952E\u5B57\u76D1\u6D4B
 log_search_keyword_reject=\u5173\u952E\u5B57\u963B\u65AD
-radius_log=RADIUS\u534F\u8BAE
-message_type=\u62A5\u6587\u7C7B\u578B
-nas_ip=NAS\u63A5\u5165IP
-framed_ip=\u670D\u52A1\u5668\u4E0B\u53D1\u7684\u7528\u6237\u5730\u5740
-log_user_name=\u7528\u6237\u540D
+radius_log=Radius \u534F\u8BAE
+message_type=Code
+nas_ip=NAS IP Address
+framed_ip=Framed IP Address
+log_user_name=User Name
+av_tips=\u5BF9\u4E8E\u97F3\u89C6\u9891\u7F16\u7801\u7684\u7D22\u5F15\u4FE1\u606F\u5728\u97F3\u89C6\u9891\u6587\u4EF6\u5C3E\u90E8\u7684\u60C5\u51B5\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301\uFF0C\u5BF9\u4E8E\u5206\u8FA8\u7387\u5927\u4E8E4\u5146\u7684\u89C6\u9891\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301
--- a/src/main/resources/sql/20181212/add_sys_menu.sql
+++ b/src/main/resources/sql/20181212/add_sys_menu.sql
@@ -1,2 +1,2 @@
 #添加 RADIUS协议日志
-INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1179', '1131', '0,1,152,1131,', 'radius_log', 'RADIUS协议日志', '80', '/log/ntc/radiusLogs', '', '', '1', '', '1', '2018-12-12 15:14:37', '1', '2018-12-12 15:14:37', '', '1', NULL, '0', '0', '650');
+INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1179', '1131', '0,1,152,1131,', 'radius_log', 'RADIUS协议日志', '80', '/log/ntc/radiusLogs', '', '', '1', '', '1', '2018-12-12 15:14:37', '1', '2018-12-12 15:14:37', '', '1', NULL, '0', '0', '');
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/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,6 +447,10 @@ 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">
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/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>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/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>
--- a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
+++ b/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">
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/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;
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/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));
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/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));
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/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));