From 6d980848c9e515c610dc047427b57e8bb4f892b4 Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 26 Nov 2018 16:10:37 +0800 Subject: [PATCH] =?UTF-8?q?app=E5=8D=8F=E8=AE=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A2=E5=8C=85=E7=8E=87=E5=92=8CBlock=20B?= =?UTF-8?q?y=20Application=20Server=20Ip=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/configuration/AppPolicyCfg.java | 10 ++++++---- .../configuration/BasicProtocolController.java | 2 +- .../EncryptedTunnelBehaviorController.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index 854ac2038..c64e7de10 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -40,21 +40,23 @@ 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=3) + @ExcelField(title="basic_protocol",sort=5) private String appName; - @ExcelField(title="behaviour_type",sort=4) + @ExcelField(title="behaviour_type",sort=6) private String behavName; private String cfgKeywords; private String userRegion1; + @ExcelField(title="ratelimit",dictType="APP_RATE_LIMIT",sort=3) private String userRegion2; private String userRegion3; + @ExcelField(title="block_by_app_server_ip",dictType="SYS_YES_NO",sort=4) private String userRegion4; private String userRegion5; private String configType; - @ExcelField(title="encrypted_tunnel_behavior",sort=3) + @ExcelField(title="encrypted_tunnel_behavior",sort=5) private String behaviorName; - @ExcelField(title="social_app",sort=3) + @ExcelField(title="social_app",sort=5) private String socialName; diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index 15f9c591d..e5d7ab9ef 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -255,7 +255,7 @@ public class BasicProtocolController extends BaseController { classMap.put(entity.getMenuNameCode(), AppPolicyCfg.class); classMap.put("NTC_IP", IpPortCfg.class); classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); - String cfgIndexInfoNoExport=",encrypted_tunnel_behavior,behaviour_type,social_app,behaviour_type,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport=",ratelimit,block_by_app_server_ip,encrypted_tunnel_behavior,behaviour_type,social_app,behaviour_type,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String ipPortInfoNoExport=",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" diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index 036cbf807..278d1e5bd 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -293,7 +293,7 @@ public class EncryptedTunnelBehaviorController extends BaseController { classMap.put(entity.getMenuNameCode(), AppPolicyCfg.class); classMap.put("NTC_IP", IpPortCfg.class); classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class); - String cfgIndexInfoNoExport=",social_app,basic_protocol,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport=",ratelimit,block_by_app_server_ip,social_app,basic_protocol,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String ipPortInfoNoExport=",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"