From c24a877998b9dbf15dd8dfe2f994d7749e1b5fd2 Mon Sep 17 00:00:00 2001 From: DuanDongmei Date: Sat, 1 Dec 2018 12:09:09 +0800 Subject: [PATCH] =?UTF-8?q?APP=5FPOLICY=E7=95=8C=E9=9D=A2=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E9=9A=A7=E9=81=93=E7=B1=BB=E5=9E=8Bmultimedia=20video?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=BB=8E1=E5=8F=98=E4=B8=BA90001=EF=BC=8Coth?= =?UTF-8?q?er=E7=BC=96=E7=A0=81=E4=BB=8E6=E5=8F=98=E4=B8=BA90006=20Tor=20m?= =?UTF-8?q?ode=E3=80=81Tor=20broswer=E3=80=81Opera=20Turbo=E3=80=81Opera?= =?UTF-8?q?=20mini=E5=8F=98=E4=B8=BA=E8=A1=8C=E4=B8=BA=E7=B1=BB=E5=9E=8B,?= =?UTF-8?q?=E2=80=9C=E6=A0=B8=E5=BF=83=E5=BA=94=E7=94=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E2=80=9D=E4=B8=AD=E5=88=A0=E9=99=A4=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8C=85=E6=95=B0=E5=AD=97=E8=8A=82=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E4=B8=8B=E8=BD=BD=E5=8C=85=E6=95=B0=E5=AD=97=E8=8A=82?= =?UTF-8?q?=E6=95=B0=E5=9B=BD=E9=99=85=E5=8C=96=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=BD=AC=E5=85=B3=E9=94=AE=E5=B8=A7=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 12 ++++-------- src/main/resources/messages/message_ru.properties | 12 ++++-------- src/main/resources/messages/message_zh_CN.properties | 12 ++++-------- src/main/resources/nis.properties | 2 +- .../sql/20181201/update_app_behavior_dic.sql | 6 ++++++ 5 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/sql/20181201/update_app_behavior_dic.sql diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index cde6feab7..e05f72464 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1323,14 +1323,10 @@ transfer_bytes=Transfer Bytes user_info=User Info user_list=User List equal_password=Password Inconsistent! -outgoing_unicast_packets=Outgoing Unicast Packets -outgoing_unicast_total_size=Outgoing Unicast Total Size -outgoing_broadcast_packets=Outgoing Broadcast Packets -outgoing_broadcast_total_size=Outgoing Broadcast Total Size -incoming_unicast_packets=Incoming Unicast_packets -incoming_unicast_total_size=Incoming Unicast Total Size -incoming_broadcast_packets=Incoming Broadcast Packets -incoming_broadcast_total_size=Incoming Broadcast Total Size +outgoing_unicast_packets=Upload Packets +outgoing_unicast_total_size=Upload Byte +incoming_unicast_packets=Download Packets +incoming_unicast_total_size=Download Byte address_pool=Address Pool ip_total=IP Total available_ip_total=Available IP Total diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 50bcee0f2..e554de19b 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1323,14 +1323,10 @@ transfer_bytes=Transfer Bytes user_info=User Info user_list=User List equal_password=Password Inconsistent! -outgoing_unicast_packets=Outgoing Unicast Packets -outgoing_unicast_total_size=Outgoing Unicast Total Size -outgoing_broadcast_packets=Outgoing Broadcast Packets -outgoing_broadcast_total_size=Outgoing Broadcast Total Size -incoming_unicast_packets=Incoming Unicast_packets -incoming_unicast_total_size=Incoming Unicast Total Size -incoming_broadcast_packets=Incoming Broadcast Packets -incoming_broadcast_total_size=Incoming Broadcast Total Size +outgoing_unicast_packets=Upload Packets +outgoing_unicast_total_size=Upload Byte +incoming_unicast_packets=Download Packets +incoming_unicast_total_size=Download Byte address_pool=Address Pool ip_total=IP Total available_ip_total=Available IP Total diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 0ae47723f..32f4a78b0 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1321,14 +1321,10 @@ transfer_bytes=\u4F20\u8F93\u6570\u636E\u5B57\u8282 user_info=\u7528\u6237\u4FE1\u606F user_list=\u7528\u6237\u5217\u8868 equal_password=\u5BC6\u7801\u4E0D\u4E00\u81F4\uFF01 -outgoing_unicast_packets=\u4E0A\u4F20\u6570\u636E\u5305\u6570 -outgoing_unicast_total_size=\u4E0A\u4F20\u5B57\u8282\u6570 -outgoing_broadcast_packets=outgoing_broadcast_packets -outgoing_broadcast_total_size=outgoing_broadcast_total_size -incoming_unicast_packets=\u4E0B\u8F7D\u6570\u636E\u5305\u6570 -incoming_unicast_total_size=\u4E0B\u8F7D\u6570\u636E\u5B57\u8282\u6570 -incoming_broadcast_packets=incoming_broadcast_packets -incoming_broadcast_total_size=incoming_broadcast_total_size +outgoing_unicast_packets=Upload Packets +outgoing_unicast_total_size=Upload Byte +incoming_unicast_packets=Download Packets +incoming_unicast_total_size=Download Byte address_pool=\u5730\u5740\u6C60 ip_total=IP\u603B\u6570 available_ip_total=\u53EF\u7528IP\u6570 diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index ecfe72e8d..ae075b913 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -531,7 +531,7 @@ mmFileDigestLog=mmFileDigestLogs ntcStreamMediaLog=ntcStreamMediaLogs #\u97f3\u89c6\u9891\u6837\u4f8b\u9650\u5236\u65f6\u957f\uff0c\u5355\u4f4d\u79d2 av_duration_limit=120 -video_to_picture_proc=/root/code/shot_detect/shot_detect +video_to_picture_proc=/home/ceiec/av_feature_gen/save_video_frame #\u8bc1\u4e66\u6587\u4ef6\u8def\u5f84 cert_file_path=/home/cert/ #\u8bc1\u4e66\u6821\u9a8c\u5de5\u5177\u540d\u79f0 diff --git a/src/main/resources/sql/20181201/update_app_behavior_dic.sql b/src/main/resources/sql/20181201/update_app_behavior_dic.sql new file mode 100644 index 000000000..c5bce428d --- /dev/null +++ b/src/main/resources/sql/20181201/update_app_behavior_dic.sql @@ -0,0 +1,6 @@ +#APP_POLICY界面上的隧道类型multimedia video编码从1变为90001，other编码从6变为90006 +update specific_service_cfg a set a.spec_service_code=90006 where a.spec_service_code=6 and a.cfg_type=2 and a.spec_service_name='other'; +update specific_service_cfg a set a.spec_service_code=90001 where a.spec_service_code=1 and a.cfg_type=2 and a.spec_service_name='multimedia_video'; +#Tor mode、Tor broswer、Opera Turbo、Opera mini的行为类型见“行为类型” sheet +update specific_service_cfg set parent_id=36,is_leaf=1 where spec_service_id in(35,283); +update specific_service_cfg set parent_id=47,is_leaf=1 where spec_service_id in(45,46);