diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index f99246955..0fdbf5a47 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -7,10 +7,39 @@ import java.util.Map; import com.google.gson.GsonBuilder; public final class Constants { + + /** + * 用户自定义域,限速 + */ + public static final String USERREGION_RATE_LIMIT=Configurations.getStringProperty("userregion_rate_limit", "RATE_LIMIT"); + /** + * 用户自定义域,策略分组号 + */ + public static final String USERREGION_IR_STRATEGY=Configurations.getStringProperty("userregion_ir_strategy", "IR_STRATEGY"); + /** + * 用户自定义域,策略分组类型 + */ + public static final String USERREGION_IR_TYPE=Configurations.getStringProperty("userregion_ir_type", "IR_TYPE"); + /** + * 用户自定义域,域名ID + */ + public static final String USERREGION_DOMIAN_ID=Configurations.getStringProperty("userregion_domian_id", "DOMIAN_ID"); + /** + * 用户自定义域,域名 + */ + public static final String USERREGION_DOMIAN_STR=Configurations.getStringProperty("userregion_domian_str", "DOMIAN_STR"); + /** + * IP复用业务类型 + */ + public static final int SERVICE_IP_RATELIMIT = Configurations.getIntProperty("service_ip_ratelimit", 0x421); /** * IP复用业务类型 */ public static final int SERVICE_IP_MULITIPLEX = Configurations.getIntProperty("service_ip_mulitiplex", 768); + /** + * 域名拦截业务类型 + */ + public static final Integer SERVICE_PXY_DOMAIN_INTERCEPT = Configurations.getIntProperty("service_pxy_domain_intercept",0x201); /** * 当前时区 */ @@ -336,7 +365,6 @@ public final class Constants { public static final String PROTOCOL_NUM_REGION = Configurations.getStringProperty("protocol_num_region","protocol_num"); public static final String BGP_IP_REGION = Configurations.getStringProperty("bgp_ip_region","bgp_ip"); public static final String KEYWORD_EXPR = Configurations.getStringProperty("keyword_expr","***and***"); - public static final Integer SERVICE_PXY_DOMAIN_INTERCEPT = Configurations.getIntProperty("service_pxy_domain_intercept",0x201); //用户自定义域分隔符 public static final String USER_REGION_SPLIT = Configurations.getStringProperty("user_region_split", ";"); //用户自定义域占位符 diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 543705fc4..b4f2b04d1 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -191,6 +191,11 @@ public class IpCfgService extends CrudService { maatCfg.setGroupRelationList(groupRelationList); maatCfg.setGroupNum(groupRelationList.size()); maatCfg.setAreaIpRegionList(areaIpRegionList); + if(Constants.SERVICE_IP_MULITIPLEX==cfg.getServiceId().intValue()){ + + }else if(Constants.SERVICE_IP_RATELIMIT==cfg.getServiceId().intValue()){ + maatCfg.setUserRegion(Constants.USERREGION_RATE_LIMIT+"="+cfg.getRatelimit()); + } configCompileList.add(maatCfg); maatBean.setOpAction(Constants.INSERT_ACTION); maatBean.setConfigCompileList(configCompileList); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 2f5d47256..b2bd00f94 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -688,6 +688,7 @@ target_ip_protect=target ip protect ratelimit_config=ratelimit config ip_ratelimit=ip ratelimit domain_ratelimit=domain ratelimit +ratelimit=ratelimit scale #=============about manipulation========= #=============about Maintenance========= ip_multiplex_pool_config=ip multiplex pool config diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 8429e6643..fb6d3a704 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -672,6 +672,7 @@ target_ip_protect=target ip protect ratelimit_config=ratelimit config ip_ratelimit=ip ratelimit domain_ratelimit=domain ratelimit +ratelimit=ratelimit scale #=============about manipulation========= #=============about Maintenance========= ip_multiplex_pool_config=ip multiplex pool config diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 722f9f279..a07cdfc17 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -716,6 +716,7 @@ target_ip_protect=\u76EE\u6807IP\u9632\u62A4 ratelimit_config=\u9650\u6D41\u7BA1\u7406 ip_ratelimit=ip\u9650\u6D41 domain_ratelimit=\u57DF\u540D\u9650\u6D41 +ratelimit=\u9650\u901F\u6BD4\u4F8B #=============about manipulation========= #=============about app config=========== domain=\u57DF\u540D diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 9657637a6..19dd4ea16 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -289,4 +289,11 @@ keyword_expr=***and*** time_zone=8 #需要特殊处理的业务类型 service_pxy_domain_intercept=513 -service_ip_mulitiplex=768 \ No newline at end of file +service_ip_mulitiplex=768 +service_ip_ratelimit=1057 +#用户自定义域 +userregion_rate_limit=RATE_LIMIT +userregion_ir_strategy=IR_STRATEGY +userregion_ir_type=ir_type +userregion_domian_id=DOMIAN_ID +userregion_domian_str=DOMIAN_STR \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp index 2fae455fb..c6bfe2d0b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp @@ -161,10 +161,25 @@ $(function(){ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 254ff8de7..ecc82be88 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -224,6 +224,9 @@ + + + @@ -279,6 +282,12 @@ ${cfg.groupName } + + + 0% + ${cfg.ratelimit}% + + ${cfg.requestName }