(1)asn导入加入组织国家，asn号验证，组织国家不能为空，asn号不能为两个组织所有
(2)新增asn_keyword_cfg表，用于保存并下发有效且含审核通过asn ip的 asn号 (3)asn 导入去除条数限制 (4)页面asn select选项还是会影响加载页面速度，现在改为input (5)asn_group_info 修改org_group_id为issued_ips，用于保存审核通过的asn ip (6)分组复用url配置文件补全v1
This commit is contained in:
wangxin
@@ -1213,7 +1213,7 @@ single_keyword_tip=Only single key input is allowed.
|
||||
ipv4_mask_range_tip=IP mask must between 16 and 32
|
||||
ipv6_mask_range_tip=IP Mask must between 2 and 128
|
||||
letter_cancel_info=Cancel Letter Info
|
||||
import_tip_excel=Please choose a valid Excel file with which it's subfix is .xlsx to import.
|
||||
import_tip_excel=Excel 2007 or later versions are supported
|
||||
http_keyword=Website Keyword
|
||||
http_keyword_monit=Website Keyword Monitor
|
||||
http_keyword_reject=Website Keyword Block
|
||||
@@ -1451,4 +1451,9 @@ asn_group=ASN Group
|
||||
can_not_edit_issued_ans_group=Can not edit valid ASN group
|
||||
can_not_delete_asn_group_with_audited_ip=Can not delete ASN group with approved IP
|
||||
organization=Organization
|
||||
mismatch=Mismatch
|
||||
mismatch=Mismatch
|
||||
can_not_delete_asn_group_with_audited_ip_address=Can not delete ASN group with approved packet IP address
|
||||
country_code=Country Code
|
||||
asn_name=ASN Name
|
||||
details=Details
|
||||
NTC_ASN_NUMBER=ASN
|
||||
@@ -1213,7 +1213,7 @@ single_keyword_tip=\u0414\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\
|
||||
ipv4_mask_range_tip=\u041c\u0430\u0441\u043a\u0430 IP \u0434\u043e\u043b\u0436\u043d\u0430 \u0441\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c \u043c\u0435\u0436\u0434\u0443 16 \u0438 32
|
||||
ipv6_mask_range_tip=IP-\u043c\u0430\u0441\u043a\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u043c\u0435\u0436\u0434\u0443 2 \u0438 128
|
||||
letter_cancel_info=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043f\u0438\u0441\u044c\u043c\u0430
|
||||
import_tip_excel=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0444\u0430\u0439\u043b Excel, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0439 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430 \u0434\u043b\u044f \u0438\u043c\u043f\u043e\u0440\u0442\u0430 .xlsx.
|
||||
import_tip_excel=Excel 2007 or later versions are supported
|
||||
http_keyword=\u041a\u043b\u044e\u0447\u0435\u0432\u044b\u0435 \u0441\u043b\u043e\u0432\u0430 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430
|
||||
http_keyword_monit=\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433 \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430
|
||||
http_keyword_reject=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432 \u0432\u0435\u0431-c\u0430\u0439\u0442\u0430
|
||||
@@ -1455,4 +1455,9 @@ asn_group=ASN Group
|
||||
can_not_edit_issued_ans_group=Can not edit valid ASN group
|
||||
can_not_delete_asn_group_with_audited_ip=Can not delete ASN group with approved IP
|
||||
organization=Organization
|
||||
mismatch=Mismatch
|
||||
mismatch=Mismatch
|
||||
can_not_delete_asn_group_with_audited_ip_address=Can not delete ASN group with approved packet IP address
|
||||
country_code=Country Code
|
||||
asn_name=ASN Name
|
||||
details=Details
|
||||
NTC_ASN_NUMBER=ASN
|
||||
@@ -1208,7 +1208,7 @@ single_keyword_tip=Only single key input is allowed.
|
||||
ipv4_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e16\u548c32\u4e4b\u95f4
|
||||
ipv6_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e2\u548c128\u4e4b\u95f4
|
||||
letter_cancel_info=\u53d6\u6d88\u5ba1\u6838\u6765\u51fd
|
||||
import_tip_excel=\u8bf7\u9009\u62e9\u6587\u4ef6\u7ed3\u5c3e\u4e3a.xlsx\u7684\u6709\u6548Excel\u6587\u4ef6\u5bfc\u5165
|
||||
import_tip_excel=\u4ec5\u652f\u6301Excel 2007\u4ee5\u53ca\u4e4b\u540e\u7248\u672c
|
||||
http_keyword=\u7f51\u9875\u5173\u952e\u5b57
|
||||
http_keyword_monit=\u7f51\u9875\u5173\u952e\u5b57\u76d1\u6d4b
|
||||
http_keyword_reject=\u7f51\u9875\u5173\u952e\u5b57\u963b\u65ad
|
||||
@@ -1451,4 +1451,9 @@ asn_group=ASN\u7ec4
|
||||
can_not_edit_issued_ans_group=\u4e0d\u80fd\u4fee\u6539\u6709\u6548\u7684ASN\u7ec4
|
||||
can_not_delete_asn_group_with_audited_ip=\u4e0d\u80fd\u5220\u9664\u5305\u542b\u5ba1\u6838\u901a\u8fc7ip\u7684ASN\u7ec4
|
||||
organization=\u7ec4\u7ec7
|
||||
mismatch=\u4e0d\u5339\u914d
|
||||
mismatch=\u4e0d\u5339\u914d
|
||||
can_not_delete_asn_group_with_audited_ip_address=\u4e0d\u80fd\u5220\u9664\u5305\u542b\u5728\u5df2\u5ba1\u6838ip\u5730\u5740\u914d\u7f6e\u4e2d\u7684asn\u7ec4
|
||||
country_code=\u56fd\u5bb6\u4ee3\u7801
|
||||
asn_name=ASN\u7ec4\u7ec7\u540d
|
||||
details=\u8BE6\u60C5
|
||||
NTC_ASN_NUMBER=ASN
|
||||
@@ -521,7 +521,7 @@ app_id_region=APP_ID
|
||||
#application spec service code scope
|
||||
app_spec_service_code_max_val=310000
|
||||
app_spec_service_code_min_val=300001
|
||||
groupReuseSources=groupReuseSources
|
||||
groupReuseSources=v1/groupReuseSources
|
||||
log_time_range=300000
|
||||
log_time_start=2018-08-01 00:00:00
|
||||
log_time_end=2018-10-01 00:00:00
|
||||
@@ -550,7 +550,7 @@ mulity_thread_size=5
|
||||
ntcRadiusReport=v2/ntcRadiusReport
|
||||
ntcCollectVoipLog=v1/ntcCollectVoipLogs
|
||||
ntcKeywordsUrlLog=v1/ntcKeywordsUrlLogs
|
||||
save_and_del_thread_size=5
|
||||
save_and_del_thread_size=20
|
||||
#mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e
|
||||
max_allowed_packet=1048576
|
||||
#http client\u8fde\u63a5\u6c60\u76f8\u5173\u53c2\u6570\uff0chttp_max_connection:\u6700\u5927\u8fde\u63a5\u6570\uff0cdefault_max_perroute:\u6bcf\u4e2a\u4e3b\u673a\u5730\u5740\u7684\u5e76\u53d1\u6570\uff0cpoolcm_socket_timeout:socket\u8d85\u65f6\u65f6\u95f4
|
||||
|
||||
42
src/main/resources/sql/20190106/asn_group_info.sql
Normal file
42
src/main/resources/sql/20190106/asn_group_info.sql
Normal file
@@ -0,0 +1,42 @@
|
||||
#修改 org_group_id为issued_ips
|
||||
/*
|
||||
Navicat Premium Data Transfer
|
||||
|
||||
Source Server : 204
|
||||
Source Server Type : MySQL
|
||||
Source Server Version : 100214
|
||||
Source Host : 192.168.10.204:3306
|
||||
Source Schema : gwall_dev
|
||||
|
||||
Target Server Type : MySQL
|
||||
Target Server Version : 100214
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 06/01/2019 10:11:01
|
||||
*/
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
SET FOREIGN_KEY_CHECKS = 0;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for asn_group_info
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `asn_group_info`;
|
||||
CREATE TABLE `asn_group_info` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`group_id` int(11) NOT NULL,
|
||||
`organization` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||
`country` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||
`detail` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||
`create_time` datetime(0) NOT NULL,
|
||||
`creator_id` int(11) NOT NULL,
|
||||
`edit_time` datetime(0) NULL DEFAULT NULL,
|
||||
`editor_id` int(11) NULL DEFAULT NULL,
|
||||
`is_valid` int(2) NOT NULL COMMENT '-1删除 1有效0无效',
|
||||
`asn_id` bigint(20) NOT NULL COMMENT 'asn号',
|
||||
`issued_ips` int(11) NOT NULL DEFAULT 0,
|
||||
`compile_id` int(11) NOT NULL COMMENT 'asn 号的编译ID',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 507295 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
|
||||
|
||||
SET FOREIGN_KEY_CHECKS = 1;
|
||||
59
src/main/resources/sql/20190106/asn_keyword_cfg.sql
Normal file
59
src/main/resources/sql/20190106/asn_keyword_cfg.sql
Normal file
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
Navicat Premium Data Transfer
|
||||
|
||||
Source Server : 204
|
||||
Source Server Type : MySQL
|
||||
Source Server Version : 100214
|
||||
Source Host : 192.168.10.204:3306
|
||||
Source Schema : gwall_dev
|
||||
|
||||
Target Server Type : MySQL
|
||||
Target Server Version : 100214
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 06/01/2019 10:10:12
|
||||
*/
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
SET FOREIGN_KEY_CHECKS = 0;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for asn_keyword_cfg
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `asn_keyword_cfg`;
|
||||
CREATE TABLE `asn_keyword_cfg` (
|
||||
`cfg_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增',
|
||||
`cfg_desc` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||
`cfg_keywords` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对应maat规范的字符串表keywords字段',
|
||||
`action` int(11) NOT NULL COMMENT '1:阻断，2：监测， 5： FD 白名单，6：监测白名单，7: FD 监测都白名单，应与业务ID所代表的逻辑相匹配，8-灰名单',
|
||||
`is_valid` int(11) NOT NULL COMMENT '0无效，1有效，-1删除;1） 未审核时配置可删除;2） 审核通过，此字段置1;3） 取消审核通过，此字段置0',
|
||||
`is_audit` int(11) NOT NULL COMMENT '0未审核，1审核通过，2审核未通过，3取消审核通过;1） 审核未通过，配置可修改;2） 审核通过，配置不可删除，只能取消审核通过',
|
||||
`creator_id` int(11) NOT NULL COMMENT '取自sys_user.id',
|
||||
`create_time` datetime(0) NOT NULL,
|
||||
`editor_id` int(11) NULL DEFAULT NULL COMMENT '取自sys_user.id',
|
||||
`edit_time` datetime(0) NULL DEFAULT NULL,
|
||||
`auditor_id` int(11) NULL DEFAULT NULL COMMENT '取自sys_user.id',
|
||||
`audit_time` datetime(0) NULL DEFAULT NULL,
|
||||
`service_id` int(11) NOT NULL COMMENT '参考系统业务类型管理表',
|
||||
`request_id` int(11) NOT NULL COMMENT '取自request_info.id',
|
||||
`compile_id` int(11) NOT NULL COMMENT '取自服务接口返回的maat配置的编译id，配置初始入库时获取。',
|
||||
`is_area_effective` int(11) NOT NULL COMMENT '0否，1是',
|
||||
`classify` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类id，多个用英文逗号分隔',
|
||||
`attribute` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质id，多个用英文逗号分隔',
|
||||
`lable` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签id,多个用英文逗号分隔',
|
||||
`expr_type` int(11) NOT NULL COMMENT '0：无表达式，1：与表达式',
|
||||
`match_method` int(11) NOT NULL COMMENT 'expr_type:0时有意义，其它情况必须置0。0：子串匹配；1：右匹配；2：左匹配；3：完全匹配',
|
||||
`is_hexbin` int(11) NOT NULL COMMENT '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
|
||||
`area_effective_ids` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多个英文逗号分隔',
|
||||
`function_id` int(11) NULL DEFAULT NULL,
|
||||
`cfg_region_code` int(11) NULL DEFAULT NULL,
|
||||
`cfg_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
|
||||
`user_region1` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留自定义域1',
|
||||
`user_region2` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留自定义域2',
|
||||
`user_region3` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留自定义域3',
|
||||
`user_region4` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留自定义域4',
|
||||
`user_region5` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留自定义域5',
|
||||
PRIMARY KEY (`cfg_id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
|
||||
|
||||
SET FOREIGN_KEY_CHECKS = 1;
|
||||
Reference in New Issue
Block a user