diff --git a/src/main/java/com/nis/domain/configuration/AppByteCfg.java b/src/main/java/com/nis/domain/configuration/AppByteCfg.java index 1587b9f47..785586f3b 100644 --- a/src/main/java/com/nis/domain/configuration/AppByteCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppByteCfg.java @@ -28,7 +28,7 @@ public class AppByteCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -93,11 +93,11 @@ public class AppByteCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppDomainCfg.java b/src/main/java/com/nis/domain/configuration/AppDomainCfg.java index 30e24f777..f0db9a873 100644 --- a/src/main/java/com/nis/domain/configuration/AppDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppDomainCfg.java @@ -28,7 +28,7 @@ public class AppDomainCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppDomainCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java b/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java index f33e086f6..ede2b6489 100644 --- a/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java @@ -27,7 +27,7 @@ public class AppHeaderCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppHeaderCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppHttpCfg.java b/src/main/java/com/nis/domain/configuration/AppHttpCfg.java index 5f775cd35..61b60d52b 100644 --- a/src/main/java/com/nis/domain/configuration/AppHttpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppHttpCfg.java @@ -28,7 +28,7 @@ public class AppHttpCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -93,11 +93,11 @@ public class AppHttpCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java b/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java index 44ca43c9e..1f9cf9981 100644 --- a/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java @@ -28,7 +28,7 @@ public class AppInnerRuleCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppInnerRuleCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppIpCfg.java b/src/main/java/com/nis/domain/configuration/AppIpCfg.java index 921aaaf66..22e93fefe 100644 --- a/src/main/java/com/nis/domain/configuration/AppIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppIpCfg.java @@ -20,7 +20,7 @@ public class AppIpCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -213,11 +213,11 @@ public class AppIpCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index 2873bfd98..a2dfa5366 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -34,7 +34,7 @@ public class AppPolicyCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -145,11 +145,11 @@ public class AppPolicyCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java b/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java index 0d4af4a17..ecc4d1510 100644 --- a/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java @@ -27,7 +27,7 @@ public class AppSslCertCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppSslCertCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppStringCfg.java b/src/main/java/com/nis/domain/configuration/AppStringCfg.java index f61ef011e..1c55cd66f 100644 --- a/src/main/java/com/nis/domain/configuration/AppStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppStringCfg.java @@ -30,7 +30,7 @@ public class AppStringCfg extends BaseStringCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; /* (non-Javadoc) * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() @@ -53,11 +53,11 @@ public class AppStringCfg extends BaseStringCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } diff --git a/src/main/java/com/nis/domain/configuration/AppTcpCfg.java b/src/main/java/com/nis/domain/configuration/AppTcpCfg.java index 40270b491..37bd61bfc 100644 --- a/src/main/java/com/nis/domain/configuration/AppTcpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppTcpCfg.java @@ -27,7 +27,7 @@ public class AppTcpCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -121,11 +121,11 @@ public class AppTcpCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java index 9fb349789..105d2b631 100644 --- a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java @@ -26,7 +26,7 @@ public class AppTopicDomainCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; // private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -101,11 +101,11 @@ public class AppTopicDomainCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } // public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 7e565231f..cc50d83dc 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -109,20 +109,20 @@ public class BaseIpCfg extends BaseCfg { /** * 限速比例 */ - protected Integer ratelimit ; + protected String ratelimit ; /** * ratelimit * @return ratelimit */ - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } /** * @param ratelimit the ratelimit to set */ - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } /** diff --git a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java index 17564f535..2fb7b43a9 100644 --- a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java @@ -20,19 +20,19 @@ import com.nis.util.Constants; */ public class HttpUrlCfg extends BaseStringCfg { private static final String tableName="http_url_cfg"; - private Integer ratelimit; + private String ratelimit; /** * ratelimit * @return ratelimit */ - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } /** * @param ratelimit the ratelimit to set */ - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } /** diff --git a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java index d3e48df2f..91417546c 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java @@ -22,7 +22,7 @@ public class IpAddrTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java index caaf60321..dd08bbfe9 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java @@ -44,7 +44,7 @@ public class IpCfgTemplate { private String attributeName;//18 private String lableName;//19 private String areaEffectiveIds;//20 - private Integer ratelimit;//21 + private String ratelimit;//21 private Integer dnsStrategyId;//22 private Integer irType;//23 private String userRegion1;//77 @@ -128,13 +128,13 @@ public class IpCfgTemplate { * @return ratelimit */ @ExcelField(title="ratelimit",align=2,sort=74) - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } /** * @param ratelimit the ratelimit to set */ - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } /** diff --git a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java index 29ba68dc0..06e489d15 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java @@ -28,7 +28,7 @@ public class IpMultiplexPolicyTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java index de667fa22..c4515e7c4 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java @@ -22,7 +22,7 @@ public class IpsecTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java index 277564871..b94bc7841 100644 --- a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java @@ -22,7 +22,7 @@ public class TunnelIpTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java index 910b77bb1..337f0413c 100644 --- a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java @@ -57,7 +57,7 @@ public class WhiteListIpTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 08cd1bc25..900c541ce 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -54,7 +54,6 @@ import com.nis.util.DictUtils; import com.nis.util.JsonMapper; import com.nis.util.StringUtil; import com.nis.util.excel.ExportExcel; -import com.nis.web.dao.configuration.InterceptCfgDao; import com.nis.web.service.ArchiveServcie; import com.nis.web.service.AreaService; import com.nis.web.service.DictService; @@ -1064,13 +1063,18 @@ public class BaseController { } } if("ipratelimit".equals(specialItem)) { - Integer ratelimit=value.getRatelimit(); + String ratelimit=value.getRatelimit(); if(ratelimit==null) { errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("ratelimit"))+";"); }else { - if(ratelimit.intValue()<0||ratelimit.intValue()>100) { - errInfo.append(prop.getProperty("ratelimit_limit")+";"); + try { + if(Double.parseDouble(ratelimit)<0||Double.parseDouble(ratelimit)>1) { + errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ratelimit_limit"))+";"); + } + }catch (Exception e) { + errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ratelimit_limit"))+";"); } + } } //attribute check end diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 309954269..5d0adadbc 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -27,7 +27,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -435,7 +435,7 @@ #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, - #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER} @@ -446,7 +446,7 @@ #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, - #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER} @@ -1951,7 +1951,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2060,7 +2060,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2173,7 +2173,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2274,7 +2274,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2373,7 +2373,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2472,7 +2472,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2584,7 +2584,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2685,7 +2685,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2806,7 +2806,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml index 68c8ae8f3..8c2fff8ea 100644 --- a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml @@ -28,7 +28,7 @@ - + @@ -77,7 +77,7 @@ #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},#{cfgRegionCode,jdbcType=INTEGER} - ,#{ratelimit,jdbcType=INTEGER} + ,#{ratelimit,jdbcType=VARCHAR} SELECT @@ -253,7 +253,7 @@ AND ${page.alias}.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER} - AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=INTEGER} + AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=VARCHAR} @@ -339,7 +339,7 @@ AND r.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER} - AND r.RATELIMIT =#{ratelimit,jdbcType=INTEGER} + AND r.RATELIMIT =#{ratelimit,jdbcType=VARCHAR} @@ -468,7 +468,7 @@ cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER}, - ratelimit = #{ratelimit,jdbcType=INTEGER}, + ratelimit = #{ratelimit,jdbcType=VARCHAR}, diff --git a/src/main/resources/sql/alter_ratelimit_varchar.sql b/src/main/resources/sql/alter_ratelimit_varchar.sql new file mode 100644 index 000000000..6cd4ae953 --- /dev/null +++ b/src/main/resources/sql/alter_ratelimit_varchar.sql @@ -0,0 +1,10 @@ +ALTER TABLE app_byte_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_domain_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_http_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_layer_header_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_policy_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_ssl_cert_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE area_ip_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE dns_domain_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE http_url_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE ip_port_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';