Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

src/main/java/com/nis/domain/configuration/AppDomainCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppHeaderCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppHttpCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppIpCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppPolicyCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppSslCertCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppStringCfg.java

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

src/main/java/com/nis/domain/configuration/AppTcpCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java

@@ -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() {

src/main/java/com/nis/domain/configuration/BaseIpCfg.java

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

src/main/java/com/nis/domain/configuration/CfgIndexInfo.java

@@ -10,10 +10,6 @@ package com.nis.domain.configuration;
 
 import java.util.List;
 
-import com.nis.domain.SysRole;
-import com.nis.util.excel.ExcelField;
-import com.nis.util.excel.fieldtype.RoleListType;
-
 
 /**
  * @ClassName: CfgIndexInfo.java 

src/main/java/com/nis/domain/configuration/HttpUrlCfg.java

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

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();
 	}

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

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();
 	}

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();
 	}

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();
 	}

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();
 	}