From 434ef5da8ec05c1647a44b80b697599037d9d9cf Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 22 Oct 2018 16:26:44 +0800 Subject: [PATCH] =?UTF-8?q?http-url=E3=80=81ddos=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/AppPolicyCfg.java | 12 +++++----- .../com/nis/domain/configuration/BaseCfg.java | 12 +++++----- .../nis/domain/configuration/BaseIpCfg.java | 22 +++++++++---------- .../nis/domain/configuration/DdosIpCfg.java | 5 ++++- .../ntc/WhiteListController.java | 2 +- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index d2bfa25ef..af0dc2d55 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -39,9 +39,9 @@ public class AppPolicyCfg extends BaseCfg { private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; - @ExcelField(title="basic_protocol",sort=2) + @ExcelField(title="basic_protocol",sort=3) private String appName; - @ExcelField(title="behaviour_type",sort=3) + @ExcelField(title="behaviour_type",sort=4) private String behavName; private String cfgKeywords; private String userRegion1; @@ -51,9 +51,9 @@ public class AppPolicyCfg extends BaseCfg { private String userRegion5; private String configType; - @ExcelField(title="encrypted_tunnel_behavior",sort=2) + @ExcelField(title="encrypted_tunnel_behavior",sort=3) private String behaviorName; - @ExcelField(title="social_app",sort=2) + @ExcelField(title="social_app",sort=3) private String socialName; @@ -92,12 +92,12 @@ public class AppPolicyCfg extends BaseCfg { } @Expose - @ExcelField(title="expression_type") + @ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=202) @SerializedName("exprType") private Integer exprType ; @Expose - @ExcelField(title="match_method") + @ExcelField(title="match_method",dictType="MATCH_METHOD",sort=203) @SerializedName("matchMethod") private Integer matchMethod ; diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 9b0bae9b3..962c6fe22 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -36,15 +36,15 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected String showName;//表在界面上展示的名称 protected String seltype;//选中类型,页面搜索用 protected String tableName; - @ExcelField(title="userregion1",sort=2) + @ExcelField(title="userregion1",sort=3) protected String userRegion1; - @ExcelField(title="userregion2",sort=3) + @ExcelField(title="userregion2",sort=4) protected String userRegion2; - @ExcelField(title="userregion3",sort=4) + @ExcelField(title="userregion3",sort=5) protected String userRegion3; - @ExcelField(title="userregion4",sort=5) + @ExcelField(title="userregion4",sort=6) protected String userRegion4; - @ExcelField(title="userregion5",sort=6) + @ExcelField(title="userregion5",sort=7) protected String userRegion5; /** * 编译id @@ -72,7 +72,7 @@ public class BaseCfg extends BaseEntity implements Cloneable{ * GK类型 */ @Expose - @ExcelField(title="action",dictType="SERVICE_ACTION",sort=20) + @ExcelField(title="action",dictType="SERVICE_ACTION",sort=2) protected Integer action; /** * 有效标识 diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 3767cae4b..e261cd37b 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -42,24 +42,24 @@ public class BaseIpCfg extends BaseCfg { */ @Expose @SerializedName("ipType") - @ExcelField(title="ip_type",dictType="IP_TYPE",sort=2) + @ExcelField(title="ip_type",dictType="IP_TYPE",sort=3) protected Integer ipType; - @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=3) + @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=4) protected Integer ipPattern; - @ExcelField(title="client_ip",sort=4) + @ExcelField(title="client_ip",sort=5) protected String srcIpAddress; - @ExcelField(title="server_ip",sort=5) + @ExcelField(title="server_ip",sort=6) protected String destIpAddress; - @ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=6) + @ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=7) protected Integer portPattern; - @ExcelField(title="client_port",sort=7) + @ExcelField(title="client_port",sort=8) protected String srcPort; - @ExcelField(title="server_port",sort=8) + @ExcelField(title="server_port",sort=9) protected String destPort; protected Integer dnsStrategyId; - @ExcelField(title="ir_type",dictType="IR_TYPE",sort=9) + @ExcelField(title="ir_type",dictType="IR_TYPE",sort=10) protected Integer irType; - @ExcelField(title="group_name",sort=10) + @ExcelField(title="group_name",sort=11) protected String groupName; private List ntcSubscribeIdCfgList; @@ -97,14 +97,14 @@ public class BaseIpCfg extends BaseCfg { */ @Expose @SerializedName("direction") - @ExcelField(title="direction",dictType="DIRECTION",sort=11) + @ExcelField(title="direction",dictType="DIRECTION",sort=12) protected Integer direction ; /** * 协议 */ @Expose @SerializedName("protocol") - @ExcelField(title="protocol",dictType="PROTOCOL",sort=12) + @ExcelField(title="protocol",dictType="PROTOCOL",sort=13) protected Integer protocol ; /** * 协议ID diff --git a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java index 5dfd52082..c1271858a 100644 --- a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java @@ -8,6 +8,7 @@ */ package com.nis.domain.configuration; +import com.nis.util.excel.ExcelField; /** * @ClassName: DnsIpConfig.java @@ -21,9 +22,11 @@ public class DdosIpCfg extends BaseIpCfg { * */ private static final long serialVersionUID = -5446903784736960824L; - + @ExcelField(title="antiddos_protocol",sort=41) private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP， + @ExcelField(title="bps_threadshold",sort=42) private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数 + @ExcelField(title="pps_threadshold",sort=43) private Long ppsThreadshold; public String getAntiddosProtocol() { diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index ca6be82b7..e4fcc11e6 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -343,7 +343,7 @@ public class WhiteListController extends CommonController{ titleList.add("NTC_HTTP_URL"); classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); classMap.put("NTC_HTTP_URL", HttpUrlCfg.class); - String cfgIndexInfoNoExport=",policy_name,do_log,letter,whether_area_block,classification,attribute,label,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String httpUrlInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + ",config_time,editor,edit_time,auditor,audit_time" +",letter,whether_area_block,classification,attribute,label"