From 40b96346bd46fda1e6cce76e7e806377976e4c4d Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 18 Sep 2018 17:14:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 8 +++++++- src/main/resources/messages/message_ru.properties | 12 +++++++++--- src/main/resources/messages/message_zh_CN.properties | 8 +++++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index ba9466368..fe6c7b69a 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1154,4 +1154,10 @@ p2p_proto=P2P Protocol p2p_file_id=File Marking p2p_keyword=Emule Search Keyword APP_PAYLOAD=App PayLoad Feature -APP_DNS=App Dns Feature \ No newline at end of file +APP_DNS=App Dns Feature +mm_speaker_recognization_reject=Speaker Recognization Reject +mm_speaker_recognization_monit=Speaker Recognization Monitoring +mm_logo_detection_monit=Logo Detection Monitoring +mm_logo_detection_reject=Logo Detection Reject +mm_face_recognization_monit=Face Recognization Monitoring +mm_face_recognization_reject=Face Recognization Reject \ 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 4731edad0..93f8c2a83 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -459,14 +459,14 @@ save_sort=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0421\u043E\u0 menu=\u041C\u0435\u043D\u044E parent_menu=\u0420\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u0441\u043A\u043E\u0435 \u041C\u0435\u043D\u044E aim=\u0426\u0435\u043B\u044C -click_menu_turn=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u041C\u0435\u043D\u044E, \u0447\u0442\u043E\u0431\u044B \u043F\u0435\u0440\u0435\u0439\u0442\u0438 \u043D\u0430 \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443 +click_menu_turn=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \uFFFD\u041C\u0435\u043D\u044E\uFFFD, \u0447\u0442\u043E\u0431\u044B \u043F\u0435\u0440\u0435\u0439\u0442\u0438 \u043D\u0430 \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443 link_window_info=\u041E\u0442\u043A\u0440\u044B\u0442\u043E\u0435 \u043E\u043A\u043D\u043E \u0447\u0435\u0440\u0435\u0437 URL-\u0430\u0434\u0440\u0435\u0441\u0443, \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \: mainFrame is_top_menu=\u041C\u0435\u043D\u044E \u0412\u0435\u0440\u0445\u043D\u0435\u0433\u043E \u0423\u0440\u043E\u0432\u043D\u044F icon=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 is_top_menu_info=\u042F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043B\u0438 \u044D\u0442\u043E \u043C\u0435\u043D\u044E \u0432\u0435\u0440\u0445\u043D\u0438\u043C \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u043C \u043C\u0435\u043D\u044E sort_info=\u041F\u043E\u0440\u044F\u0434\u043E\u043A \u0441\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0438 \u043F\u043E \u0432\u043E\u0437\u0440\u0430\u0441\u0442\u0430\u043D\u0438\u044E. is_show_sysmenu=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044F \u043B\u0438 \u044D\u0442\u043E \u043C\u0435\u043D\u044E \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C \u043C\u0435\u043D\u044E -control_permission_info=\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043F\u043E\u043B\u043D\u043E\u043C\u043E\u0447\u0438\u044F, \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0432 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043B\u0435\u0440\u0435, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: @RequiresPermissions (\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u044F) +control_permission_info=\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043F\u043E\u043B\u043D\u043E\u043C\u043E\u0447\u0438\u044F, \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0432 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043B\u0435\u0440\u0435, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: @RequiresPermissions (\uFFFD\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u044F\uFFFD) role_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0420\u043E\u043B\u044F data_range=\u0414\u0438\u0430\u043F\u043E\u0437\u043E\u043D \u0414\u0430\u043D\u043D\u044B\u0445 allot=\u0420\u0430\u0437\u0434\u0430\u0432\u0430\u0442\u044C @@ -1158,4 +1158,10 @@ p2p_proto=P2P Protocol p2p_file_id=File Marking p2p_keyword=Emule Search Keyword APP_PAYLOAD=App PayLoad Feature -APP_DNS=App Dns Feature \ No newline at end of file +APP_DNS=App Dns Feature +mm_speaker_recognization_reject=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u963B\u65AD +mm_speaker_recognization_monit=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u76D1\u6D4B +mm_logo_detection_monit=\u53F0\u6807\u8BC6\u522B\u76D1\u6D4B +mm_logo_detection_reject=\u53F0\u6807\u8BC6\u522B\u963B\u65AD +mm_face_recognization_monit=\u4EBA\u8138\u8BC6\u522B\u76D1\u6D4B +mm_face_recognization_reject=\u4EBA\u8138\u8BC6\u522B\u963B\u65AD \ 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 1daf1de3d..6c352f9e4 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1152,4 +1152,10 @@ p2p_proto=P2P\u534F\u8BAE p2p_file_id=\u6587\u4EF6\u6807\u8BC6 p2p_keyword=Emule\u641C\u7D22\u5173\u952E\u8BCD APP_PAYLOAD=APP\u8F7D\u8377\u7279 -APP_DNS=APP DNS \ No newline at end of file +APP_DNS=APP DNS +mm_speaker_recognization_reject=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u963B\u65AD +mm_speaker_recognization_monit=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u76D1\u6D4B +mm_logo_detection_monit=\u53F0\u6807\u8BC6\u522B\u76D1\u6D4B +mm_logo_detection_reject=\u53F0\u6807\u8BC6\u522B\u963B\u65AD +mm_face_recognization_monit=\u4EBA\u8138\u8BC6\u522B\u76D1\u6D4B +mm_face_recognization_reject=\u4EBA\u8138\u8BC6\u522B\u963B\u65AD From 53d83710b0b298a6d5f4ef87ed5dff2ad1f99990 Mon Sep 17 00:00:00 2001 From: leijun Date: Tue, 18 Sep 2018 17:39:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9F=B3=E8=A7=86=E9=A2=91=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95serviceid=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/20180918/update_avAudio.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/resources/sql/20180918/update_avAudio.sql diff --git a/src/main/resources/sql/20180918/update_avAudio.sql b/src/main/resources/sql/20180918/update_avAudio.sql new file mode 100644 index 000000000..0dd26589b --- /dev/null +++ b/src/main/resources/sql/20180918/update_avAudio.sql @@ -0,0 +1,7 @@ +#修改基于音视频传输的IP PORT阻断业务的业务ID，由0x100改为0x10F +update function_service_dict set service_id='271' where dict_id='21'; +#修改基于音视频传输的URL阻断业务的业务ID，由0x101改为0x110 +update function_service_dict set service_id='272' where dict_id='30'; +#音视频添加action白名单 +INSERT INTO `function_service_dict` VALUES (130,20, 0, 128, 'whitelist', 256, 'av_content_ip_whitelist', '', 1, NULL, NULL, NULL, NULL, '2'); +INSERT INTO `function_service_dict` VALUES (131,22, 0, 128, 'whitelist', 257, 'av_content_url_whitelist', '', 1, NULL, NULL, NULL, NULL, '2'); \ No newline at end of file From c60e42d2ba843dfffe6eb0b13027f3e1bbd816ed Mon Sep 17 00:00:00 2001 From: leijun Date: Tue, 18 Sep 2018 18:20:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E3=80=81=E6=9D=A5=E5=87=BD=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BB=85=E6=8C=89=E7=85=A7=E7=BB=88=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/dao/configuration/RequestInfoDao.xml | 16 +++++++++++----- .../nis/web/dao/configuration/TaskInfoDao.xml | 14 ++++++++++---- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 6d9a86251..c08b6396b 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -69,11 +69,17 @@ AND r.IS_VALID != -1 - - AND r.request_time between #{beginDate} and #{endDate} - - - AND r.edit_time between #{dobeginDate} and #{doendDate} + + AND r.request_time >= #{beginDate} + + + AND r.request_time <= #{endDate} + + + AND r.edit_time >= #{dobeginDate} + + + AND r.edit_time <= #{doendDate} ${sqlMap.dsf} diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index 71df9a380..68116e88d 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -65,11 +65,17 @@ AND r.is_audit=${isAudit} - - AND r.task_time between #{beginDate} and #{endDate} + + AND r.task_time >= #{beginDate} - - AND r.edit_time between #{dobeginDate} and #{doendDate} + + AND r.task_time <= #{endDate} + + + AND r.edit_time >= #{dobeginDate} + + + AND r.edit_time <= #{doendDate}