gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
leijun
2018-09-18 15:27:44 +08:00
parent ae97d72a8c 66bf0be104
commit 03b6d13293
8 changed files with 121 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/messages/message_en.properties
View File

@@ -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
p2p_keyword=Emule Search Keyword
APP_PAYLOAD=App PayLoad Feature
APP_DNS=App Dns Feature

8
src/main/resources/messages/message_ru.properties
View File

@@ -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
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

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -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
p2p_keyword=Emule\u641C\u7D22\u5173\u952E\u8BCD
APP_PAYLOAD=APP\u8F7D\u8377\u7279
APP_DNS=APP DNS

2
src/main/resources/sql/20180917/update_service_dict.sql Normal file
View File

@@ -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)

7
src/main/resources/sql/20180917/update_statistics_tables.sql Normal file
View File

@@ -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 'ͳ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>';
ALTER TABLE request_num_statistics ADD COLUMN statistic_time datetime NULL COMMENT 'ͳ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>';
update cfg_num_statistics set cfg_type=0;
ALTER TABLE cfg_num_statistics CHANGE cfg_type compile_id int null default 0;

82
src/main/resources/sql/20180918/add_appFeature.sql Normal file
View File

@@ -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);

11
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -62,7 +62,12 @@ $(function(){
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<h3 class="page-title">
<spring:message code="app_header_config"></spring:message>
<%-- <spring:message code="app_header_config"></spring:message> --%>
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<spring:message code="${region.configRegionValue}"></spring:message>
</c:if>
</c:forEach>
</h3>
<div class="row">
<div class="col-md-12">
@@ -154,7 +159,7 @@ $(function(){
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="layer" /></label>
<spring:message code="district" /></label>
<div class="col-md-6">
<select name="district"
class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
@@ -186,7 +191,7 @@ $(function(){
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="header" /></label>
<spring:message code="Keywords" /></label>
<!-- 此配置的关键词可以输入多个关键词 -->
<c:if test="${region.configMultiKeywords eq 1}">
<div class="col-md-6">

13
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
View File

@@ -57,7 +57,12 @@
</div>
<h3 class="page-title">
<spring:message code="app_header_config"></spring:message>
<%-- <spring:message code="app_header_config"></spring:message> --%>
<c:forEach items="${regionList}" var="region">
<c:if test="${cfg.functionId eq region.functionId}">
<spring:message code="${region.configRegionValue}"></spring:message>
</c:if>
</c:forEach>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">
@@ -99,7 +104,7 @@
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgKeywords"><spring:message code="header"></spring:message></form:option>
<form:option value="cfgKeywords"><spring:message code="Keywords"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
@@ -279,8 +284,8 @@
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="layer"/></th>
<th><spring:message code="header"/></th>
<th><spring:message code="district"/></th>
<th><spring:message code="Keywords"/></th>
<th><spring:message code="is_hex"/></th>
<th><spring:message code="is_case_insenstive"/></th>
<th><spring:message code="expression_type"/></th>