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