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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

Browse Source 
into develop

Conflicts:
	src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
	src/main/resources/nis.properties
	src/main/webapp/WEB-INF/tags/sys/delRow.tag
	
	asn相关功能更改：
	IP ADDR：增加asn域
	1、新增IP
ADDR可选asn，如果asn未下发过（is_used=0），下发时asn的group需要标记为commonGroup（groupId为asn组织的groupId，regionId为asn的regionId）。
	2、如果所选的asn组(asn组织的groupId)已经下发过（is_used=1），则下发maat时，asn域不需要下发。
	3、策略取消时，如果有需要保留的公共组（commongRroupIds），需要将公共组的组号下发。
	ASN GROUP:
	1、新增asn，如果此asn的组织groupId已下发过（is_used=1），且此组织的groupId已被策略标记过全选（is_audit_all=1），则需要调用公共组域新增的接口，将新增的asn关键字下发。
	2、修改asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域修改的接口，修改已经下发的asn关键字域。
	3、删除asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域删除的接口，删除已经下发的asn关键字域。
	ASN IP CFG:
	1、新增asn ip，所选asn no的组首次下发（is_valid=0），需要将asn no的groupId标记为公共组；如果asn
no非首次下发（is_valid=1），直接调用公共组新增域的接口。
	2、修改
		生效状态asn ip修改，调用公共组修改域接口直接修改
	3、失效
		直接调用公共组删除域接口，失效asn ip域
This commit is contained in:
duandongmei
2019-01-16 14:33:29 +06:00
parent db9dd66ab2 e62b5d24be
commit cb9aa36954
174 changed files with 7535 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1018,7 +1018,7 @@ domain_intercepter_ratelimit=Domain Intercept Rate Limit
app_built_in_features_config=APP Built-in Features
PXY_INTERCEPT_PKT_BIN=Packet Payload
certificate=Certificate
do_log=Log Option
do_log=Do Log
file_strategy=File Strategy
file_desc=File Desc
content_type=Content Type
@@ -1045,7 +1045,7 @@ keyring_name=Key Pair Name
keyring_type=Certificate Type
private_key_file=Private Key File
public_key_file=Public Key File
expire_after=Expire After
expire_after=Expire After(Days)
issuer=Certificate Issuer
certificate_subject=Certificate Subject
not_before_time=Certificate Start Time
@@ -1467,4 +1467,11 @@ website_statistics=Website Statistics
not_exist=not exist
real_time=Real Time
history=History
all_columns_hidden=All columns are hidden!
all_columns_hidden=All columns are hidden!
no_log=No Log
all_log=Meta And File Log
framework_log=Meta Log
block_drop=Block(Drop)
mail_record=Mail Records
ssl_record=SSL Records
http_record=HTTP Records

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

@@ -342,10 +342,10 @@ expression_type=\u0422\u0438\u043f \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0
null_expression=\u041d\u0435\u0442 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u044f
and_expression=&
match_method=\u041c\u0435\u0442\u043e\u0434\u044b \u0441\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u0435
substring_match=\u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435 \u041F\u043E\u0434\u0441\u0442\u0440\u043E\u043A\u043E\u0439
right_match= \u0421\u0443\u0444\u0444\u0438\u043A\u0441 \u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435
left_match=\u041F\u0440\u0435\u0444\u0438\u043A\u0441 \u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435
exactly_match=\u0422\u043E\u0447\u043D\u043E\u0441\u0442\u044C\u044E \u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435
substring_match=\u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435 \u041F\u043E\u0434\u0441\u0442\u0440\u043E\u043A\u043E\u0439
right_match= \u0421\u0443\u0444\u0444\u0438\u043A\u0441 \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
left_match=\u041F\u0440\u0435\u0444\u0438\u043A\u0441 \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
exactly_match=\u0422\u043E\u0447\u043D\u043E\u0441\u0442\u044C\u044E \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
whether_hexbinary=\u041d\u0435\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u043a \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0443 \u0438\u043b\u0438 \u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c, \u0438\u043b\u0438 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 HEX
hex_binary=HEX \u0444\u043e\u0440\u043c\u0430\u0442
case_insensitive_nohex=\u041d\u0435\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d \u043a \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0443, \u0438 \u043d\u0435 HEX
@@ -1018,7 +1018,7 @@ domain_intercepter_ratelimit=\u041f\u0435\u0440\u0435\u0445\u0432\u0430\u0442 \u
app_built_in_features_config=\u0412\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0435 \u043f\u0440\u0438\u0437\u043d\u0430\u043a\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
PXY_INTERCEPT_PKT_BIN=\u041f\u043e\u043b\u0435\u0437\u043d\u0430\u044f \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043f\u0430\u043a\u0435\u0442\u043e\u0432
certificate=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442
do_log=\u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b \u0438\u043b\u0438 \u043d\u0435\u0442
do_log=\u041D\u0430\u0434\u043E \u043B\u0438 \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u0436\u0443\u0440\u043D\u0430\u043B
file_strategy=\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0430 \u0444\u0430\u0439\u043b\u043e\u0432
file_desc=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u043e\u0432
content_type=\u0422\u0438\u043f \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f
@@ -1045,7 +1045,7 @@ keyring_name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u0440
keyring_type=\u0422\u0438\u043f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
private_key_file=\u0424\u0430\u0439\u043b \u0441 \u0437\u0430\u043a\u0440\u044b\u0442\u043e\u043c \u043a\u043b\u044e\u0447\u043e\u043c
public_key_file=\u0424\u0430\u0439\u043b \u0441 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c \u043a\u043b\u044e\u0447\u043e\u043c
expire_after=\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442 \u043f\u043e\u0441\u043b\u0435
expire_after=\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442 \u043f\u043e\u0441\u043b\u0435(\u0414\u043D\u0438)
issuer=\u042d\u043c\u0438\u0442\u0435\u043d\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
certificate_subject=\u041f\u0440\u0435\u0434\u043c\u0435\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
not_before_time=\u0412\u0440\u0435\u043c\u044f \u043d\u0430\u0447\u0430\u043b\u0430 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
@@ -1471,4 +1471,11 @@ website_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430
not_exist=not exist
real_time=Real Time
history=History
all_columns_hidden=All columns are hidden!
all_columns_hidden=All columns are hidden!
no_log=\u041D\u0435\u0442 \u0416\u0443\u0440\u043D\u0430\u043B\u043E\u0432
all_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B \u0438 \u0416\u0443\u0440\u043D\u0430\u043B-\u0444\u0430\u0439\u043B
framework_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B
block_drop=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435(\u041f\u0430\u0434\u0435\u043d\u0438\u0435)
mail_record=\u0417\u0430\u043F\u0438\u0441\u0438 \u041F\u043E\u0447\u0442\u044B
ssl_record=SSL \u0417\u0430\u043F\u0438\u0441\u0438
http_record=HTTP \u0417\u0430\u043F\u0438\u0441\u0438

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

@@ -1017,7 +1017,7 @@ domain_intercepter_ratelimit=\u57df\u540d\u62e6\u622a\u9650\u901f
app_built_in_features_config=APP\u5185\u7f6e\u7279\u5f81\u7ef4\u62a4
PXY_INTERCEPT_PKT_BIN=\u5305\u8f7d\u8377
certificate=\u8bc1\u4e66
do_log=\u8bb0\u5f55\u975e\u7ed3\u6784\u5316\u65e5\u5fd7
do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7
file_strategy=\u6587\u4ef6\u7b56\u7565
file_desc=\u6587\u4ef6\u63cf\u8ff0\t
content_type=\u5185\u5bb9\u7c7b\u578b
@@ -1044,7 +1044,7 @@ keyring_name=\u79d8\u94a5\u5bf9\u540d\u79f0
keyring_type=\u8bc1\u4e66\u7c7b\u578b
private_key_file=\u79c1\u94a5\u6587\u4ef6
public_key_file=\u516c\u94a5\u6587\u4ef6
expire_after=\u518d\u6b21\u9881\u53d1\u6709\u6548\u671f
expire_after=\u518d\u6b21\u9881\u53d1\u6709\u6548\u671f(\u5929)
issuer=\u8bc1\u4e66\u9881\u53d1\u8005
certificate_subject=\u8bc1\u4e66\u62e5\u6709\u8005
not_before_time=\u8bc1\u4e66\u8d77\u59cb\u65f6\u95f4
@@ -1467,4 +1467,11 @@ website_statistics=\u7f51\u7ad9\u7edf\u8ba1
not_exist=\u4e0d\u5b58\u5728
real_time=\u5b9e\u65f6
history=\u5386\u53f2
all_columns_hidden=\u6240\u6709\u7684\u5217\u90fd\u9690\u85cf\u4e86\uff01
all_columns_hidden=\u6240\u6709\u7684\u5217\u90fd\u9690\u85cf\u4e86\uff01
no_log=\u4E0D\u8BB0\u5F55
all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7
framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
block_drop=\u5C01\u5835(\u4E22\u5F03)
mail_record=\u90AE\u4EF6\u6CDB\u6536
ssl_record=SSL\u6CDB\u6536
http_record=HTTP\u6CDB\u6536

5
src/main/resources/nis.properties
View File

@@ -614,7 +614,10 @@ blockAndDropStat=v1/blockAndDropStat
configStartStop=v2/configStartStop
trafficAppTrend=v1/trafficAppTrend
appConnRecordTop100=v1/appConnRecordTop100
#SSL\u6cdb\u6536
ntcSslRecordLog=v1/ntcSslRecordLogs
ntc_asn_number=NTC_ASN_NUMBER
addRegionToCommonGroup=v1/addRegionToCommonGroup
updateRegionToCommonGroup=v1/updateCommonGroupRegion
deleteRegionToCommonGroup=v1/delCommonGroupRegion
deleteRegionToCommonGroup=v1/delCommonGroupRegion

20
src/main/resources/sql/20190113/function_service_dict_add_do_log.sql Normal file
View File

@@ -0,0 +1,20 @@
#snat<61><74>ַ<EFBFBD>ع<EFBFBD><D8B9><EFBFBD>
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=834 AND function_id=633;
#snat ip
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=835 AND function_id=300;
#dnat ip
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=836 AND function_id=304;
#dns strategy
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=65 AND function_id=400;
ALTER TABLE dns_res_strategy ADD COLUMN `do_log` int(11) DEFAULT NULL;
#dns ip
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=64 AND function_id=401;
ALTER TABLE dns_ip_cfg ADD COLUMN `do_log` int(11) DEFAULT NULL;
#<23><><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=520 AND function_id=570;
ALTER TABLE pxy_obj_keyring ADD COLUMN `do_log` int(11) DEFAULT NULL;
#<23><><EFBFBD><EFBFBD>֤<EFBFBD><D6A4>
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=640 AND function_id=571;
ALTER TABLE pxy_obj_trusted_ca_cert ADD COLUMN `do_log` int(11) DEFAULT NULL;

64
src/main/resources/sql/20190113/update_app_paylload_feature_dict.sql Normal file
View File

@@ -0,0 +1,64 @@
-- <20>޸<EFBFBD>app payload<61><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD>
UPDATE `function_region_dict` SET `dict_id`='212', `function_id`='563', `config_district`='Payload,L2_header,L3_header_IP,L3_header_ICMP', `config_region_code`='3', `config_region_value`='APP_PAYLOAD', `config_desc`='APP<EFBFBD>غ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', `is_valid`='1', `is_maat`='1', `region_type`='3', `creator_id`=NULL, `create_time`='2018-09-21 19:29:46', `editor_id`=NULL, `edit_time`='2018-09-21 19:29:48', `config_service_type`='', `config_expr_type`='0,1,3', `config_match_method`='0,1,2,3', `config_ip_type`='', `config_hex`='0,1,2', `config_multi_keywords`='1', `config_ip_pattern`='', `config_port_pattern`='', `config_direction`='', `config_protocol`='', `config_ip_port_show`='', `config_region_sort`='2', `is_import`='0' WHERE (`dict_id`='212');
UPDATE `function_region_dict` SET `dict_id`='213', `function_id`='563', `config_district`='Payload,L2_header,L3_header_IP,L3_header_ICMP', `config_region_code`='4', `config_region_value`='APP_PAYLOAD', `config_desc`='APP<EFBFBD>غ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', `is_valid`='1', `is_maat`='1', `region_type`='3', `creator_id`=NULL, `create_time`='2018-09-21 19:30:16', `editor_id`=NULL, `edit_time`='2018-09-21 19:30:20', `config_service_type`='', `config_expr_type`='0,1,3', `config_match_method`='0,1,2,3', `config_ip_type`='', `config_hex`='0,1,2', `config_multi_keywords`='1', `config_ip_pattern`='', `config_port_pattern`='', `config_direction`='', `config_protocol`='', `config_ip_port_show`='', `config_region_sort`='3', `is_import`='0' WHERE (`dict_id`='213');
UPDATE `function_region_dict` SET `dict_id`='215', `function_id`='563', `config_district`='Payload,L2_header,L3_header,C2S_session_size,S2C_session_size', `config_region_code`='5', `config_region_value`='APP_PAYLOAD', `config_desc`='APP<EFBFBD>غ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', `is_valid`='0', `is_maat`='1', `region_type`='3', `creator_id`=NULL, `create_time`='2018-09-21 19:30:16', `editor_id`=NULL, `edit_time`='2018-09-21 19:30:20', `config_service_type`='', `config_expr_type`='0,1', `config_match_method`='0,1,2,3', `config_ip_type`='', `config_hex`='0,1,2', `config_multi_keywords`='1', `config_ip_pattern`='', `config_port_pattern`='', `config_direction`='', `config_protocol`='', `config_ip_port_show`='', `config_region_sort`='4', `is_import`='0' WHERE (`dict_id`='215');
-- <20><><EFBFBD>ӱ<EFBFBD><D3B1><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD>Ŀ
INSERT INTO `sys_data_dictionary_item` ( `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3', 'offset_expression', 'ƫ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD>ʽ', '3', '1', '1', '84');
--<EFBFBD>ؽ<EFBFBD>app ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
drop table app_complex_feature_cfg;
CREATE TABLE `app_complex_feature_cfg` (
`cfg_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
`district` varchar(128) NOT NULL,
`cfg_keywords` varchar(2048) NOT NULL,
`app_code` int(11) NOT NULL,
`behav_code` int(11) DEFAULT NULL,
`spec_service_id` varchar(255) NOT NULL COMMENT 'specific_service_cfg .spec_service_id',
`cfg_desc` varchar(128) DEFAULT NULL,
`action` int(11) NOT NULL,
`is_valid` int(11) NOT NULL,
`is_audit` int(11) NOT NULL,
`creator_id` int(11) NOT NULL COMMENT 'sys_user.id',
`create_time` datetime NOT NULL,
`editor_id` int(11) DEFAULT NULL COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>sys_user.id',
`edit_time` datetime DEFAULT NULL,
`auditor_id` int(11) DEFAULT NULL COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>sys_user.id',
`audit_time` datetime DEFAULT NULL,
`service_id` int(11) NOT NULL COMMENT 'ҵ<EFBFBD><EFBFBD>id',
`request_id` int(11) NOT NULL COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>request_info.id',
`compile_id` int(11) NOT NULL,
`is_area_effective` int(11) NOT NULL DEFAULT 0,
`classify` varchar(128) DEFAULT NULL,
`attribute` varchar(128) DEFAULT NULL,
`lable` varchar(128) DEFAULT NULL,
`area_effective_ids` varchar(1024) DEFAULT NULL,
`function_id` int(11) NOT NULL,
`cfg_type` varchar(64) NOT NULL DEFAULT '',
`cfg_region_code` int(11) NOT NULL,
`expr_type` int(11) NOT NULL DEFAULT 0 COMMENT '0<EFBFBD><EFBFBD><EFBFBD>ޱ<EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD>1<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ',
`match_method` int(11) NOT NULL DEFAULT 3 COMMENT 'expr_type:0ʱ<30><CAB1><EFBFBD><EFBFBD><EFBFBD>壬<EFBFBD><E5A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>0<EFBFBD><30><EFBFBD>Ӵ<EFBFBD>ƥ<EFBFBD>䣻1<E4A3BB><31><EFBFBD><EFBFBD>ƥ<EFBFBD>䣻2<E4A3BB><32><EFBFBD><EFBFBD>ƥ<EFBFBD>䣻3<E4A3BB><33><EFBFBD><EFBFBD>ȫƥ<C8AB><C6A5>',
`is_hexbin` int(11) NOT NULL DEFAULT 0 COMMENT 'Ĭ<EFBFBD><EFBFBD>Ϊ0:<3A><>Сд<D0A1><D0B4><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><D0A3>ҷ<EFBFBD>HEX;1:HEX<45><58>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;2:<3A><>Сд<D0A1><D0B4><EFBFBD>У<EFBFBD><D0A3>ҷ<EFBFBD>HEX',
`do_log` int(11) DEFAULT NULL,
`user_region1` varchar(1024) DEFAULT NULL COMMENT 'Ԥ<EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1',
`user_region2` varchar(1024) DEFAULT NULL COMMENT 'Ԥ<EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2',
`user_region3` varchar(1024) DEFAULT NULL COMMENT 'Ԥ<EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>3',
`user_region4` varchar(1024) DEFAULT NULL COMMENT 'Ԥ<EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>4',
`user_region5` varchar(1024) DEFAULT NULL COMMENT 'Ԥ<EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>5',
`header_type` varchar(16) DEFAULT '',
`ver` varchar(4) DEFAULT '',
`ihl` varchar(4) DEFAULT '',
`tos` varchar(16) DEFAULT '',
`total_length` varchar(16) DEFAULT '',
`flags` varchar(32) DEFAULT '',
`fragment_offset` varchar(32) DEFAULT '',
`protocol` varchar(32) DEFAULT '',
`icmp_type` varchar(32) DEFAULT '',
`icmp_code` varchar(32) DEFAULT '',
`icmp_identifier` varchar(32) DEFAULT '',
`payload_offset` int(11) DEFAULT NULL COMMENT 'payload<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
`payload_size` int(11) DEFAULT NULL COMMENT 'payload<EFBFBD><EFBFBD><EFBFBD><EFBFBD>С',
`payload_packet_direction` varchar(8) DEFAULT NULL COMMENT 'payload<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
PRIMARY KEY (`cfg_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;

1
src/main/resources/sql/20190114/subscribe_id.sql Normal file
View File

@@ -0,0 +1 @@
update function_region_dict set region_type=2 where config_service_type='subscribe_id';

3
src/main/resources/sql/20190115/update_function_dicts.sql Normal file
View File

@@ -0,0 +1,3 @@
-- IP Spoofing Import
UPDATE function_region_dict SET is_import = 1,config_protocol = '6,17' WHERE function_id = 214;
UPDATE function_service_dict SET is_import = 1 WHERE function_id = 214;

4
src/main/resources/sql/20190116/add_sys_menu.sql Normal file
View File

@@ -0,0 +1,4 @@
--新增日志检索->流量日志(邮件泛收,SSL泛收,HTTP泛收)
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 ('1238', '1217', '0,1,152,1217,', 'ssl_record', 'SSL泛收', '170', '/log/ntc/sslRecord', '', '', '1', '', '1', '2019-01-14 18:41:35', '1', '2019-01-14 18:41:35', '', '1', NULL, '0', '0', NULL);
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 ('1239', '1217', '0,1,152,1217,', 'http_record', 'HTTP泛收', '170', '/log/ntc/httpRecord', '', '', '1', '', '1', '2019-01-14 18:41:35', '1', '2019-01-14 18:41:35', '', '1', NULL, '0', '0', NULL);
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 ('1237', '1217', '0,1,152,1217,', 'mail_record', 'Mail泛收', '140', '/log/ntc/mailRecord', '', '', '1', '', '1', '2019-01-14 18:39:16', '1', '2019-01-14 18:39:16', '', '1', NULL, '0', '0', NULL);

2
src/main/resources/sql/20190116/update_function_dicts.sql Normal file
View File

@@ -0,0 +1,2 @@
-- DDOS Monit Import
UPDATE function_region_dict SET is_import = 1 WHERE dict_id = 157;