diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index b7f1daf31..0cd93a99e 100644 --- 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. \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index c31699198..49a3b9b42 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1362,4 +1362,10 @@ show_available_ips=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C log_search_http_monit=HTTP \u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 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 \ No newline at end of file +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. \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index b7bcbeb11..09e5e28b8 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1294,7 +1294,7 @@ max_cache_obj_size=\u6700\u5927\u7F13\u5B58\u5BF9\u8C61\u5927\u5C0F cache_time_error=\u7F13\u5B58\u65F6\u95F4\u4E0D\u80FD\u8D85\u8FC7 24 \u5C0F\u65F6(1440\u5206\u949F,86400\u79D2). cache_size_error=\u7F13\u5B58\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC71024TB(1048576GB,1073741824MB). ignore_qs_error=\u5FFD\u7565\u7684\u67E5\u8BE2\u53C2\u6570\u4E2D\u5305\u542B\u4E0D\u53EF\u89C1\u5B57\u7B26\u6216\u8005\u9017\u53F7 -NTC_DDOS_PROTECT_TARGET_IP=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E +NTC_DDOS_PROTECT_TARGET_IP=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E bypass=\u767D\u540D\u5355 unlimited=unlimited req_line=\u8BF7\u6C42\u884C @@ -1305,7 +1305,7 @@ set_cookie=set-Cookie\u503C req_header=\u539F\u59CB\u8BF7\u6C42\u5934 resp_header=\u539F\u59CB\u5E94\u7B54\u5934 req_body=\u539F\u59CB\u8BF7\u6C42\u4F53 -resp_body=\u539F\u59CB\u5E94\u7B54\u4F53 +resp_body=\u539F\u59CB\u5E94\u7B54\u4F53 dns_sub=DNS\u5B89\u5168\u673A\u5236 action_cache=\u7F13\u5B58 action_cache_whitelist=\u7F13\u5B58\u767D\u540D\u5355 @@ -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 \ No newline at end of file diff --git a/src/main/resources/sql/20181212/add_sys_menu.sql b/src/main/resources/sql/20181212/add_sys_menu.sql index 4c6717657..2a58d1a48 100644 --- 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', ''); diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index 66511ee73..3bc0c341d 100644 --- 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){ +
@@ -446,7 +447,11 @@ function sampleFileValidate(fileType,fileName){ class="fileNoteInfo" data-icon="" style="cursor:default">
+
+
+ +
<%--
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 7b75b9d2a..437a5902a 100644 --- 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(){ - + <%-- --%> @@ -289,7 +289,7 @@ $(document).ready(function(){ ${log.url} - + <%-- @@ -303,7 +303,7 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - + --%> ${log.referer} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 5df2df9ad..6cfc3834e 100644 --- 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(){ - + + - + + - <%-- --%> + @@ -293,12 +295,15 @@ $(document).ready(function(){ ${log.calledAccount } ${log.callingNumber} ${log.calledNumber} - ${log.fromToStoreIp} + + ${log.fromToStoreIp} ${log.fromToStoreUrl} ${log.toFromStoreIp} - ${log.toFromStoreUrl} + ${log.toFromStoreUrl} + ${log.pid} - + + @@ -312,7 +317,8 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - + + ${log.level} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp index 00881d4a5..3108c5480 100644 --- 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();" />
-
+ <%--
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index 6f6a5f7c1..18f23c3bb 100644 --- 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; diff --git 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 index 413347497..a870fa3a8 100644 --- 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)); diff --git 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 index 970d3b696..272545420 100644 --- 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)); diff --git 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 index 5297909d7..d2061b7fc 100644 --- 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));