diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 385a088b8..7267a7490 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1519,7 +1519,6 @@ src_ip_pattern=Client IP Pattern dest_ip_pattern=Server IP Pattern src_port_pattern=Client Port Pattern dest_port_pattern=Server Port Pattern -url_group_configuration=URL Group Configuration dns_keyword_group_configuration=DNS Keyword Group Configuration app_ip_correlation=APP IP Correlation ip_group=IP Group @@ -1636,9 +1635,6 @@ ssl_error=SSL Error import_built_cert_file=Import built-in certificate built_in=built-in #---------------------------Object List Group Manage------------------------------------ -ip_group_configuration=IP Group Configuration -domain_group_configuration=Domain Group Configuration -scriberid_group_configuration=ScriberId Group Configuration common_group_manage=Common Group Manage can_not_delete_issued_group=Can not delete issued group obj_group_configuration=Object Group Configuration diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 92a9f2c10..29c3eebfa 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1523,7 +1523,6 @@ src_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u041a\u043b\u0438\u0435\ dest_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u0421\u0435\u0440\u0432\u0435\u0440\u0430 src_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u0430 \u041a\u043b\u0438\u0435\u043d\u0442\u0430 dest_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u0430 \u0421\u0435\u0440\u0432\u0435\u0440\u0430 -url_group_configuration=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0433\u0440\u0443\u043F\u043F\u044B URL dns_keyword_group_configuration=DNS Keyword Group Configuration app_ip_correlation=APP IP Correlation ip_group=IP Group @@ -1640,9 +1639,6 @@ ssl_error=\u041E\u0448\u0438\u0431\u043A\u0430 SSL import_built_cert_file=\u0418\u043C\u043F\u043E\u0440\u0442 \u0412\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u043E\u0433\u043E \u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u0430 built_in=\u0412\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0439 #---------------------------Object List Group Manage------------------------------------ -ip_group_configuration=IP Group Configuration -domain_group_configuration=Domain Group Configuration -scriberid_group_configuration=ScriberId Group Configuration common_group_manage=\u041E\u0431\u0449\u0435\u0435 \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0413\u0440\u0443\u043F\u043F\u043E\u0439 can_not_delete_issued_group=\u0413\u0440\u0443\u043F\u043F\u0430 \u0443\u0436\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F, \u043D\u0435\u043B\u044C\u0437\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C. obj_group_configuration=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0413\u0440\u0443\u043F\u043F\u044B \u041E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 @@ -1659,6 +1655,6 @@ object_list_group=Object-List-Group policy_group=Policy Group object_list=Object List ip_group_configuration=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0413\u0440\u0443\u043F\u043F\u044B IP -url_group_configuration=URL Object List +url_group_configuration=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0433\u0440\u0443\u043F\u043F\u044B URL domain_group_configuration=\u0414\u043E\u043C\u0435\u043D\u043D\u0430\u044F \u0413\u0440\u0443\u043F\u043F\u0430 scriberid_group_configuration=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0413\u0440\u0443\u043F\u043F\u044B \u0410\u0431\u043E\u043D\u0435\u0442\u043E\u0432 \ 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 ba08fb063..a47c1d66b 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1519,7 +1519,6 @@ src_ip_pattern=\u6e90IP\u683c\u5f0f dest_ip_pattern=\u76ee\u7684IP\u683c\u5f0f src_port_pattern=\u6e90\u7aef\u53e3\u683c\u5f0f dest_port_pattern=\u76ee\u7684\u7aef\u53e3\u683c\u5f0f -url_group_configuration=URL \u5206\u7ec4\u914d\u7f6e dns_keyword_group_configuration=DNS \u5173\u952e\u5b57\u5206\u7ec4\u914d\u7f6e app_ip_correlation=APP IP \u901a\u8054 ip_group=IP \u5206\u7ec4 @@ -1636,9 +1635,6 @@ ssl_error=SSL\u9519\u8bef\u4fe1\u606f import_built_cert_file=\u5BFC\u5165\u5185\u7F6E\u8BC1\u4E66 built_in=\u5185\u7F6E\u8BC1\u4E66 #---------------------------Object List Group Manage------------------------------------ -ip_group_configuration=IP \u5206\u7ec4\u914d\u7f6e -domain_group_configuration=\u57DF\u540D\u5206\u7ec4\u914d\u7f6e -scriberid_group_configuration=\u8D26\u53F7\u5206\u7ec4\u914d\u7f6e common_group_manage=\u516C\u5171\u5206\u7EC4\u7BA1\u7406 can_not_delete_issued_group=\u4E0D\u80FD\u5220\u9664\u5DF2\u7ECF\u88AB\u5F15\u7528\u7684\u5206\u7EC4 obj_group_configuration=\u5BF9\u8C61\u7EC4\u7BA1\u7406 @@ -1651,10 +1647,10 @@ most_eight_group=\u81F3\u591A\u53EF\u9009\u62E9\u0038\u4E2A\u7EC4 no_common_group=ID\u4E3A%s\u7684\u914D\u7F6E\u7F3A\u5C11\u7EC4 #---------------------------Object List Group Manage------------------------------------ built_in_tip=\u7981\u6B62\u64CD\u4F5C -object_list_group=Object-List-Group +object_list_group=\u7B56\u7565\u5BF9\u8C61\u7EC4 policy_group=\u7B56\u7565\u7EC4 -object_list=Object List -ip_group_configuration=IP Object List -url_group_configuration=URL Object List -domain_group_configuration=DOMAIN Object List -scriberid_group_configuration=SubscribeID Object List \ No newline at end of file +object_list=\u5BF9\u8C61\u7EC4 +ip_group_configuration=IP\u7EC4 +url_group_configuration=URL\u7EC4 +domain_group_configuration=\u57DF\u540D\u7EC4 +scriberid_group_configuration=\u8D26\u53F7\u7EC4 \ No newline at end of file diff --git a/src/main/resources/sql/20190626/update_function_region_dict.sql b/src/main/resources/sql/20190626/update_function_region_dict.sql new file mode 100644 index 000000000..84e614188 --- /dev/null +++ b/src/main/resources/sql/20190626/update_function_region_dict.sql @@ -0,0 +1,5 @@ +# 修改config_region_value字段值，导入模板文件名使用 +UPDATE function_region_dict SET config_region_value = 'ip_group_configuration' WHERE function_id = 605 AND is_valid = 1; +UPDATE function_region_dict SET config_region_value = 'url_group_configuration' WHERE function_id = 606 AND is_valid = 1; +UPDATE function_region_dict SET config_region_value = 'domain_group_configuration' WHERE function_id = 607 AND is_valid = 1; +UPDATE function_region_dict SET config_region_value = 'scriberid_group_configuration' WHERE function_id = 608 AND is_valid = 1; \ No newline at end of file