diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 3f8862ca6..ba9466368 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1152,4 +1152,6 @@ av_voip_account_monit=VoIP Account Monitoring p2p_proto=P2P Protocol p2p_file_id=File Marking -p2p_keyword=Emule Search Keyword \ No newline at end of file +p2p_keyword=Emule Search Keyword +APP_PAYLOAD=App PayLoad Feature +APP_DNS=App Dns Feature \ 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 7c1df0bc6..4731edad0 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1152,4 +1152,10 @@ MM_FACE_RECOGNIZATION=Face Recognization preset=Preset ip_must_select=IP\u914D\u7F6E\u5FC5\u9009 av_voip_account_reject=VoIP \u8D26\u53F7\u7BA1\u63A7 -av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B \ No newline at end of file +av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B + +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 diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 46f7267a0..1daf1de3d 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1150,4 +1150,6 @@ av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B p2p_proto=P2P\u534F\u8BAE p2p_file_id=\u6587\u4EF6\u6807\u8BC6 -p2p_keyword=Emule\u641C\u7D22\u5173\u952E\u8BCD \ No newline at end of file +p2p_keyword=Emule\u641C\u7D22\u5173\u952E\u8BCD +APP_PAYLOAD=APP\u8F7D\u8377\u7279 +APP_DNS=APP DNS \ No newline at end of file diff --git a/src/main/resources/sql/20180917/update_service_dict.sql b/src/main/resources/sql/20180917/update_service_dict.sql new file mode 100644 index 000000000..dd666942e --- /dev/null +++ b/src/main/resources/sql/20180917/update_service_dict.sql @@ -0,0 +1,2 @@ +#update audio sample porn is_valid=0 +update function_service_dict set is_valid=0 where dict_id in( 9,10) \ No newline at end of file diff --git a/src/main/resources/sql/20180917/update_statistics_tables.sql b/src/main/resources/sql/20180917/update_statistics_tables.sql new file mode 100644 index 000000000..0450ad36e --- /dev/null +++ b/src/main/resources/sql/20180917/update_statistics_tables.sql @@ -0,0 +1,7 @@ +update statistics_tables set is_valid=1 where id=14; +INSERT INTO statistics_tables ( `tab_name`, `is_valid`, `description`) VALUES ('pxy_obj_keyring', 1, ''); +INSERT INTO statistics_tables ( `tab_name`, `is_valid`, `description`) VALUES ('proxy_file_strategy_cfg', 1, ''); +ALTER TABLE cfg_num_statistics ADD COLUMN statistic_time datetime NULL COMMENT '统计时间'; +ALTER TABLE request_num_statistics ADD COLUMN statistic_time datetime NULL COMMENT '统计时间'; +update cfg_num_statistics set cfg_type=0; +ALTER TABLE cfg_num_statistics CHANGE cfg_type compile_id int null default 0; \ No newline at end of file diff --git a/src/main/resources/sql/20180918/add_appFeature.sql b/src/main/resources/sql/20180918/add_appFeature.sql new file mode 100644 index 000000000..c9b8eda5c --- /dev/null +++ b/src/main/resources/sql/20180918/add_appFeature.sql @@ -0,0 +1,82 @@ +#add app payload and app dns +INSERT INTO `function_service_dict` (`dict_id`, `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) VALUES ('127', '561', '0', '1', 'monit', '998', 'app_payload', NULL, '1', '1', NULL, NULL, NULL, '1'); +INSERT INTO `function_service_dict` (`dict_id`, `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) VALUES ('129', '562', '0', '1', 'monit', '999', 'app_dns', NULL, '1', NULL, NULL, NULL, NULL, '1'); +INSERT INTO `function_region_dict` (`config_service_type`, `config_multi_keywords`, `config_expr_type`, `config_hex`, `config_match_method`, `dict_id`, `function_id`, `config_region_code`, `config_region_value`, `config_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_ip_type`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`) VALUES ('', '0', '0,1,2', '0,1', '0,1,2,3', '203', '561', '1', 'APP_PAYLOAD', 'C2S_session_size,S2C_session_size,L2_header,L3_header', 'APP杞借嵎鐗瑰緛', '1', NULL, NULL, NULL, NULL, '1', '3', NULL, NULL, NULL, NULL, NULL, NULL, '1'); +INSERT INTO `function_region_dict` (`config_service_type`, `config_multi_keywords`, `config_expr_type`, `config_hex`, `config_match_method`, `dict_id`, `function_id`, `config_region_code`, `config_region_value`, `config_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_ip_type`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`) VALUES ('', '0', '0,1,2', '0,1', '0,1,2,3', '204', '562', '1', 'APP_DNS', 'DNS_Name', 'APP DNS鍩熷悕', '1', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '1', '3', '', '', '', '', '', '', '1'); +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 ('1075', '735', '0,1,86,717,735,', 'APP_PAYLOAD', 'APP PAYLOAD', '260', '/app/headerCfgList', '', '', '1', 'app:header:config', '1', '2018-09-16 21:40:49', '1', '2018-09-16 21:40:49', '', '1', NULL, '0', '0', '561'); +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 ('1072', '751', '0,1,150,750,751,', 'APP_PAYLOAD', 'APP PAYLOAD', '270', '/app/headerCfgList', '', '', '1', 'app:header:confirm', '1', '2018-09-16 21:43:11', '1', '2018-09-16 21:43:11', '', '1', NULL, '0', '0', '561'); +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 ('1073', '751', '0,1,150,750,751,', 'APP_DNS', 'APP DNS', '300', '/app/headerCfgList', '', '', '1', 'app:header:confirm', '1', '2018-09-16 21:43:42', '1', '2018-09-16 21:54:08', '', '1', NULL, '0', '0', '562'); +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 ('1074', '735', '0,1,86,717,735,', 'APP_DNS', 'APP DNS', '290', '/app/headerCfgList', '', '', '1', 'app:header:config', '1', '2018-09-16 21:54:57', '1', '2018-09-16 21:54:57', '', '1', NULL, '0', '0', '562'); +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 ('1076', '866', '0,1,86,717,866,', 'APP_PAYLOAD', 'APP PAYLOAD', '260', '/app/headerCfgList', '', '', '1', 'app:header:audit', '1', '2018-09-16 21:40:49', '1', '2018-09-16 21:40:49', '', '1', NULL, '0', '0', '561'); +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 ('1077', '866', '0,1,86,717,866,', 'APP_DNS', 'APP DNS', '290', '/app/headerCfgList', '', '', '1', 'app:header:audit', '1', '2018-09-16 21:54:57', '1', '2018-09-16 21:54:57', '', '1', NULL, '0', '0', '562'); + +#delete 550 app tcp session config +update function_region_dict set is_valid=0 where function_id=550; +update function_service_dict set is_valid=0 where function_id=550; +update sys_menu set del_flag=0 where function_id=550; +update statistics_tables set is_valid=1 where id=44; + +#update ssl disctrict new info +DELETE from sys_data_dictionary_item where dictionary_id=110; +INSERT INTO sys_data_dictionary_item + () +VALUES + (2204, '1', 'SSL_SNI', 'SSL_SNI', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2205, '2', 'SSL_FP', 'SSL_FP', 0, 0, 0, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2206, '3', 'serialNumber', 'serialNumber', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2207, '4', 'issuer_commonName', 'issuer_commonName', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2208, '5', 'issuer_organizationName', 'issuer_organizationName', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2209, '6', 'issuer_countryName', 'issuer_countryName', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2210, '7', 'subject_commonName', 'subject_commonName', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2211, '8', 'subject_organizationName', 'subject_organizationName', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2212, '9', 'subject_countryName', 'subject_countryName', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2213, '10', 'notBefore', 'notBefore', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2214, '11', 'notAfter', 'notAfter', 0, 1, 1, 110); + +INSERT INTO sys_data_dictionary_item + () +VALUES + (2215, '12', 'Algorithm_Id', 'Algorithm_Id', 0, 1, 1, 110); + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp index 8ac83a1f7..845e90f9e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp @@ -62,7 +62,12 @@ $(function(){

- + <%-- --%> + + + + +

@@ -154,7 +159,7 @@ $(function(){
+