gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ratelimit数据库改为varchar,pojo改为String

Browse Source
This commit is contained in:
wangxin
2018-08-25 16:37:39 +08:00
parent 4233142304
commit 0354487dc8
25 changed files with 101 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/domain/configuration/AppByteCfg.java
View File

@@ -28,7 +28,7 @@ public class AppByteCfg extends BaseCfg<AppByteCfg> {
@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<AppByteCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppDomainCfg.java
View File

@@ -28,7 +28,7 @@ public class AppDomainCfg extends BaseCfg<AppDomainCfg> {
@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<AppDomainCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppHeaderCfg.java
View File

@@ -27,7 +27,7 @@ public class AppHeaderCfg extends BaseCfg<AppHeaderCfg> {
@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<AppHeaderCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppHttpCfg.java
View File

@@ -28,7 +28,7 @@ public class AppHttpCfg extends BaseCfg<AppHttpCfg> {
@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<AppHttpCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java
View File

@@ -28,7 +28,7 @@ public class AppInnerRuleCfg extends BaseCfg<AppInnerRuleCfg> {
@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<AppInnerRuleCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppIpCfg.java
View File

@@ -20,7 +20,7 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
@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<AppIpCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
View File

@@ -34,7 +34,7 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
@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<AppPolicyCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppSslCertCfg.java
View File

@@ -27,7 +27,7 @@ public class AppSslCertCfg extends BaseCfg<AppSslCertCfg> {
@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<AppSslCertCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppStringCfg.java
View File

@@ -30,7 +30,7 @@ public class AppStringCfg extends BaseStringCfg<AppStringCfg> {
@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<AppStringCfg> {
return tableName;
}
public Integer getRatelimit() {
public String getRatelimit() {
return ratelimit;
}
public void setRatelimit(Integer ratelimit) {
public void setRatelimit(String ratelimit) {
this.ratelimit = ratelimit;
}

6
src/main/java/com/nis/domain/configuration/AppTcpCfg.java
View File

@@ -27,7 +27,7 @@ public class AppTcpCfg extends BaseCfg<AppTcpCfg> {
@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<AppTcpCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java
View File

@@ -26,7 +26,7 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
@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<AppTopicDomainCfg> {
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() {

6
src/main/java/com/nis/domain/configuration/BaseIpCfg.java
View File

@@ -109,20 +109,20 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
/**
* 限速比例
*/
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;
}
/**

6
src/main/java/com/nis/domain/configuration/HttpUrlCfg.java
View File

@@ -20,19 +20,19 @@ import com.nis.util.Constants;
*/
public class HttpUrlCfg extends BaseStringCfg<HttpUrlCfg> {
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;
}
/**

2
src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java
View File

@@ -22,7 +22,7 @@ public class IpAddrTemplate extends IpCfgTemplate {
}
@Override
public Integer getRatelimit() {
public String getRatelimit() {
// TODO Auto-generated method stub
return super.getRatelimit();
}

6
src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java
View File

@@ -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;
}
/**

2
src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java
View File

@@ -28,7 +28,7 @@ public class IpMultiplexPolicyTemplate extends IpCfgTemplate {
}
@Override
public Integer getRatelimit() {
public String getRatelimit() {
// TODO Auto-generated method stub
return super.getRatelimit();
}

2
src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java
View File

@@ -22,7 +22,7 @@ public class IpsecTemplate extends IpCfgTemplate {
}
@Override
public Integer getRatelimit() {
public String getRatelimit() {
// TODO Auto-generated method stub
return super.getRatelimit();
}

2
src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java
View File

@@ -22,7 +22,7 @@ public class TunnelIpTemplate extends IpCfgTemplate {
}
@Override
public Integer getRatelimit() {
public String getRatelimit() {
// TODO Auto-generated method stub
return super.getRatelimit();
}

2
src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java
View File

@@ -57,7 +57,7 @@ public class WhiteListIpTemplate extends IpCfgTemplate {
}
@Override
public Integer getRatelimit() {
public String getRatelimit() {
// TODO Auto-generated method stub
return super.getRatelimit();
}

12
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -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

42
src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
View File

@@ -27,7 +27,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
<result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
@@ -69,7 +69,7 @@
<result column="attribute" property="attribute" jdbcType="VARCHAR" />
<result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -102,7 +102,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -133,7 +133,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -164,7 +164,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -195,7 +195,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -226,7 +226,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
</resultMap>
@@ -292,7 +292,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -324,7 +324,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -356,7 +356,7 @@
<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
@@ -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}
</sql>
<sql id="AppTopicCommonCfg_Value_List" >
@@ -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}
</sql>
@@ -1951,7 +1951,7 @@
function_id = #{functionId,jdbcType=INTEGER},
<!-- </if>
<if test="ratelimit != null"> -->
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
<!-- </if>
<if test="cfgRegionCode != null"> -->
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2060,7 +2060,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2173,7 +2173,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2274,7 +2274,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2373,7 +2373,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2472,7 +2472,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2584,7 +2584,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2685,7 +2685,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2806,7 +2806,7 @@
function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="cfgRegionCode != null">
CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},

10
src/main/java/com/nis/web/dao/configuration/DomainDao.xml
View File

@@ -28,7 +28,7 @@
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
</resultMap>
<resultMap id="BaseStringMapWithUser" type="com.nis.domain.configuration.HttpUrlCfg" extends="BaseStringMap">
<result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
@@ -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}
</sql>
<select id="getById" resultMap="BaseStringMap" parameterType="java.lang.Long" >
SELECT
@@ -210,7 +210,7 @@
AND ${page.alias}.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
</if>
<if test="ratelimit != null">
AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
</if>
</when>
<otherwise>
@@ -296,7 +296,7 @@
AND r.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
</if>
<if test="ratelimit != null">
AND r.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
AND r.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
</if>
</otherwise>
</choose>
@@ -427,7 +427,7 @@
cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
</if>
<if test="ratelimit != null" >
ratelimit = #{ratelimit,jdbcType=INTEGER},
ratelimit = #{ratelimit,jdbcType=VARCHAR},
</if>
</trim>
</set>

10
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -34,7 +34,7 @@
<result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
<result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
<result column="ir_type" property="irType" jdbcType="INTEGER" />
<result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
@@ -183,7 +183,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}, #{functionId,jdbcType=INTEGER}, #{ratelimit,jdbcType=INTEGER},
#{areaEffectiveIds,jdbcType=VARCHAR}, #{functionId,jdbcType=INTEGER}, #{ratelimit,jdbcType=VARCHAR},
#{dnsStrategyId,jdbcType=INTEGER},#{irType,jdbcType=INTEGER},
#{userRegion1,jdbcType=VARCHAR},
#{userRegion2,jdbcType=VARCHAR},
@@ -374,7 +374,7 @@
AND ${page.alias}.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
</if>
<if test="ratelimit != null">
AND ${page.alias}.RATELIMIT=#{ratelimit,jdbcType=INTEGER}
AND ${page.alias}.RATELIMIT=#{ratelimit,jdbcType=VARCHAR}
</if>
<if test="dnsStrategyId != null">
AND ${page.alias}.DNS_STRATEGY_ID=#{dnsStrategyId,jdbcType=INTEGER}
@@ -499,7 +499,7 @@
AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
</if>
<if test="ratelimit != null">
AND r.RATELIMIT=#{ratelimit,jdbcType=INTEGER}
AND r.RATELIMIT=#{ratelimit,jdbcType=VARCHAR}
</if>
<if test="dnsStrategyId != null">
AND r.DNS_STRATEGY_ID=#{dnsStrategyId,jdbcType=INTEGER}
@@ -669,7 +669,7 @@
FUNCTION_ID=#{functionId,jdbcType=INTEGER},
</if>
<if test="ratelimit != null">
RATELIMIT=#{ratelimit,jdbcType=INTEGER},
RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
</if>
<if test="dnsStrategyId != null">
DNS_STRATEGY_ID=#{dnsStrategyId,jdbcType=INTEGER},

10
src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
View File

@@ -28,7 +28,7 @@
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
</resultMap>
<resultMap id="BaseStringMapWithUser" type="com.nis.domain.configuration.BaseStringCfg" extends="BaseStringMap">
<result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
@@ -120,7 +120,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}
</sql>
<select id="getById" resultMap="BaseStringMap" parameterType="java.lang.Long" >
SELECT
@@ -253,7 +253,7 @@
AND ${page.alias}.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
</if>
<if test="ratelimit != null">
AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
</if>
</when>
<otherwise>
@@ -339,7 +339,7 @@
AND r.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
</if>
<if test="ratelimit != null">
AND r.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
AND r.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
</if>
</otherwise>
</choose>
@@ -468,7 +468,7 @@
cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
</if>
<if test="ratelimit != null" >
ratelimit = #{ratelimit,jdbcType=INTEGER},
ratelimit = #{ratelimit,jdbcType=VARCHAR},
</if>
</trim>
</set>

10
src/main/resources/sql/alter_ratelimit_varchar.sql Normal file
View File

@@ -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之间';