From 5fa8ad485cfaeb6789c4eb4e74dce5287a149739 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 20 Aug 2018 09:24:44 +0800 Subject: [PATCH] =?UTF-8?q?region,service=E5=AD=97=E5=85=B8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/FunctionRegionDict.java | 42 +++++++++++++++++++ .../com/nis/domain/FunctionServiceDict.java | 8 ++++ .../com/nis/web/dao/FunctionRegionDictDao.xml | 9 +++- .../nis/web/dao/FunctionServiceDictDao.xml | 3 +- .../resources/sql/add_function_region_303.sql | 1 + .../sql/add_function_region_dict_columns.sql | 7 ++++ 6 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/sql/add_function_region_303.sql create mode 100644 src/main/resources/sql/add_function_region_dict_columns.sql diff --git a/src/main/java/com/nis/domain/FunctionRegionDict.java b/src/main/java/com/nis/domain/FunctionRegionDict.java index cb84c12aa..130984d68 100644 --- a/src/main/java/com/nis/domain/FunctionRegionDict.java +++ b/src/main/java/com/nis/domain/FunctionRegionDict.java @@ -21,7 +21,49 @@ public class FunctionRegionDict extends BaseCfg { private String configExprType; private String configMatchMethod; private String configServiceType; + private String configIpPortShow; + private String configIpType; + private String configIpPattern; + private String configPortPattern; + private String configDirection; + private String configProtocol; + public String getConfigIpPortShow() { + return configIpPortShow; + } + public void setConfigIpPortShow(String configIpPortShow) { + this.configIpPortShow = configIpPortShow; + } + public String getConfigIpType() { + return configIpType; + } + public void setConfigIpType(String configIpType) { + this.configIpType = configIpType; + } + public String getConfigIpPattern() { + return configIpPattern; + } + public void setConfigIpPattern(String configIpPattern) { + this.configIpPattern = configIpPattern; + } + public String getConfigPortPattern() { + return configPortPattern; + } + public void setConfigPortPattern(String configPortPattern) { + this.configPortPattern = configPortPattern; + } + public String getConfigDirection() { + return configDirection; + } + public void setConfigDirection(String configDirection) { + this.configDirection = configDirection; + } + public String getConfigProtocol() { + return configProtocol; + } + public void setConfigProtocol(String configProtocol) { + this.configProtocol = configProtocol; + } public String getConfigServiceType() { return configServiceType; } diff --git a/src/main/java/com/nis/domain/FunctionServiceDict.java b/src/main/java/com/nis/domain/FunctionServiceDict.java index 174097d23..42215de2b 100644 --- a/src/main/java/com/nis/domain/FunctionServiceDict.java +++ b/src/main/java/com/nis/domain/FunctionServiceDict.java @@ -16,6 +16,14 @@ public class FunctionServiceDict extends BaseCfg { private String serviceName; private String serviceDesc; private String actionCode; + private Integer regionCode; + + public Integer getRegionCode() { + return regionCode; + } + public void setRegionCode(Integer regionCode) { + this.regionCode = regionCode; + } public Integer getDictId() { return dictId; } diff --git a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml index 684d13790..14d58a585 100644 --- a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml +++ b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml @@ -16,11 +16,18 @@ + + + + + + dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type - ,config_multi_keywords,config_hex,config_expr_type,config_match_method,config_service_type + ,config_multi_keywords,config_hex,config_expr_type,config_match_method,config_service_type,config_ip_port_show,config_ip_type, + config_ip_pattern,config_port_pattern,config_direction,config_protocol select diff --git a/src/main/resources/sql/add_function_region_303.sql b/src/main/resources/sql/add_function_region_303.sql new file mode 100644 index 000000000..9150a9ba9 --- /dev/null +++ b/src/main/resources/sql/add_function_region_303.sql @@ -0,0 +1 @@ +INSERT INTO function_region_dict (function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type) VALUES(303,1,'LIMIT_DOMAIN','域名限速',1,1,2) \ No newline at end of file diff --git a/src/main/resources/sql/add_function_region_dict_columns.sql b/src/main/resources/sql/add_function_region_dict_columns.sql new file mode 100644 index 000000000..10bca3fa5 --- /dev/null +++ b/src/main/resources/sql/add_function_region_dict_columns.sql @@ -0,0 +1,7 @@ +ALTER TABLE function_region_dict ADD config_ip_port_show VARCHAR(10) NULL COMMENT '1,展示源IP/端口2;展示目目的IP/端口;使用逗号分隔'; +ALTER TABLE function_region_dict ADD config_ip_type VARCHAR(20) NULL COMMENT 'ip的类型，有4,6,46,64,10几种类型,使用逗号分隔'; +ALTER TABLE function_region_dict ADD config_ip_pattern VARCHAR(10) NULL COMMENT 'ip的格式 1:ip掩码;2:IP范围;3:IP;使用逗号分隔'; +ALTER TABLE function_region_dict ADD config_port_pattern VARCHAR(10) NULL COMMENT '端口的格式，1:port;2:port_mask;使用逗号分隔'; +ALTER TABLE function_region_dict ADD config_direction VARCHAR(10) NULL COMMENT 'IP方向0,双向;1,单向.使用逗号分隔'; +ALTER TABLE function_service_dict ADD region_code INT(11) NULL COMMENT 'function_region_dict 表中的config_region_code字段值'; +ALTER TABLE function_region_dict ADD config_protocol VARCHAR(20) NULL COMMENT '协议 0:任意;6:TCP;17:UDP;1:ICMP;50:ESP;51:AH';