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

Conflicts:
	src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
去掉app_tcpsession_size

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

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

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

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

src/main/java/com/nis/web/dao/configuration/AppCfgDao.java

@@ -93,4 +93,5 @@ public interface AppCfgDao {
 	public void auditCfg(BaseCfg entity);
 	//修改配置状态
 	public void updateCfgValid(BaseCfg entity);
+	public void deleteSubscribeIdCfg(AppPolicyCfg entity);
 }

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

@@ -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},
@@ -2840,6 +2840,10 @@
   <!-- 删除APP策略IP子配置 -->
   <delete id="deleteAppPolicyIpCfg" >
   	delete from ip_port_cfg where compile_id=#{compileId} and function_id=#{functionId}
+  </delete>
+    <!-- 删除SubscribeId子配置 -->
+  <delete id="deleteSubscribeIdCfg" >
+  	delete from ntc_subscribe_id_cfg where compile_id=#{compileId} and function_id=#{functionId}
   </delete>
   <!-- 查询APP策略IP子配置 -->
   <select id="getAppPolicyIpList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">

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

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

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

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

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

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

src/main/java/com/nis/web/service/configuration/AppCfgService.java

@@ -240,15 +240,11 @@ public class AppCfgService extends BaseService {
 				}
 			}
 			appCfgDao.updateAppPolicyCfg(entity);
-
+			
+			// 先删后加 各域配置
 			appCfgDao.deleteAppPolicyIpCfg(entity);
-			if (entity != null && entity.getNtcSubscribeIdCfgList() != null
-					&& entity.getNtcSubscribeIdCfgList().size() > 0) {
-				for (NtcSubscribeIdCfg ntcSubscribeIdCfg : entity.getNtcSubscribeIdCfgList()) {
-					ntcSubscribeIdCfg.setCompileId(entity.getCompileId());
-					stringcfgDao.deleteSubscribeIdCfg(ntcSubscribeIdCfg);
-				}
-			}
+			appCfgDao.deleteSubscribeIdCfg(entity);
+			
 			// 删除旧的区域IP，新增新的区域IP
 			AreaIpCfg area = new AreaIpCfg();
 			area.setCompileId(entity.getCompileId());
@@ -1449,9 +1445,9 @@ public class AppCfgService extends BaseService {
 			}
 			// 删除关键字
 			if (entity.getNtcSubscribeIdCfgList() != null && entity.getNtcSubscribeIdCfgList().size() > 0) {
-				NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
-				BeanUtils.copyProperties(entity, ntcSubscribeIdCfg, new String[] { "cfgId" });
-				stringcfgDao.updateSubscribeIdCfg(ntcSubscribeIdCfg);
+				NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });
+				stringcfgDao.updateSubscribeIdCfg(cfg);
 			}
 			// 保存区域IP信息
 			if (entity.getAreaCfg() != null && entity.getAreaCfg().size() > 0) {

src/main/java/com/nis/web/service/configuration/IpCfgService.java

@@ -627,7 +627,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 				logger.info("IP配置下发配置参数："+json);
 				//调用服务接口下发配置
 				try {
-					ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+					ToMaatResult result = ConfigServiceUtil.put(json, 2);
 					if(result!=null){
 						logger.info("IP配置配置下发响应信息："+result.getMsg());
 					}

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

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp

@@ -276,7 +276,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -315,11 +314,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
@@ -409,7 +403,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -276,7 +276,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -315,11 +314,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
@@ -409,7 +403,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp

@@ -272,12 +272,11 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="social_app"/></th>
-								    <th><spring:message code="district"/></th>
-								    <th><spring:message code="keywords"/></th>
+								    <th><spring:message code="layer"/></th>
+								    <th><spring:message code="header"/></th>
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -322,11 +321,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
@@ -416,7 +410,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -278,7 +278,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -323,11 +322,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
@@ -417,7 +411,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -283,7 +283,6 @@
 									<th><spring:message code="server_ip"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<%-- <th><spring:message code="letter"/></th>
@@ -323,13 +322,6 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.doLog }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
@@ -417,7 +409,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp

@@ -162,7 +162,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
 	</c:forEach>
 	<h3 class="page-title">
-		<spring:message code="app_policy_config"></spring:message>
+		<spring:message code="social_app_control"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -99,7 +99,7 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_policy_config"></spring:message>
+		<spring:message code="social_app_control"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
@@ -441,7 +441,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp

@@ -277,7 +277,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-								    <th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -323,11 +322,6 @@
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
 		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
-		             					</c:forEach>
 									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -416,7 +410,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp

@@ -185,8 +185,11 @@ $(function(){
                    				<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
                    				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
-                   			
-								<div class="row">
+                   				</c:if>
+                   				<input type="hidden" name="exprType" value="0">
+                   				<input type="hidden" name="matchMethod" value="0">
+                   				<input type="hidden" name="isHexbin" value="0">
+								<%-- <div class="row">
 										<div class="col-md-6">
 											<div class="form-group">
 												<label class="control-label col-md-3"><font color="red">*</font>
@@ -372,7 +375,7 @@ $(function(){
 										</div>
 									</div>
 								</div>
-								</c:if>
+								</c:if> --%>
                    		</c:forEach>
 							</div>
 							<input name="isAreaEffective" type="hidden" value="0">

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp

@@ -412,7 +412,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -424,7 +424,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -333,7 +333,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -385,7 +385,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -424,7 +424,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -334,7 +334,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp

@@ -387,7 +387,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp

@@ -658,7 +658,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -725,7 +725,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp

@@ -447,7 +447,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp

@@ -9,6 +9,11 @@ $(function(){
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
 		$("#protocolId").val($(".action:checked").attr("protocolId"));
 	}
+	var action=$(".action:checked");
+	if(!action){
+		action=$("input[name='action']");
+	}
+	var regionCode=action.attr("regionCode");
 	//initCommIpVal();
 	var serviceType=$("input[name='cfgRegionCode']").attr("serviceType");
 	if(serviceType){

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -537,7 +537,7 @@
 									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel_approved'}"><span data-audit="cancel" class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
 							            </c:forEach>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp

@@ -430,7 +430,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp

@@ -405,7 +405,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp

@@ -447,7 +447,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -446,7 +446,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp

@@ -435,7 +435,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp

@@ -424,7 +424,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -467,7 +467,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp

@@ -263,7 +263,7 @@
 									</div>
 								</div>
 								<!-- dolog begin-->
-								<div class="row">
+								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -431,7 +431,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp

@@ -433,7 +433,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp

@@ -320,6 +320,7 @@
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -431,6 +432,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -692,7 +692,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp

@@ -321,7 +321,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp

@@ -322,7 +322,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp

@@ -436,7 +436,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp

@@ -35,10 +35,14 @@
 										//loading('onloading...');
 										var flag = true;
 										var subscribeId=0;
+										console.log("boxSolid:"+$(".boxSolid.hidden").length);
+										console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId"));
 										//存在隐藏的subscribeId，不算进域配置
 										if($(".boxSolid.hidden").hasClass("subscribeId")){
 											subscribeId=1;
 										}
+										console.log("boxSolid not sub:"+($(".boxSolid").length-1));
+										console.log("hidden not sub:"+($(".boxSolid.hidden").length-subscribeId));
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
 										if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
@@ -309,7 +313,7 @@
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:if test="${region.configServiceType eq 'subscribe_id' }">

src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp

@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp

@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp

@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp

@@ -82,6 +82,7 @@
 						$(this).find("[name='parent.specServiceId']").removeAttr("name");
 						$(this).find("[name='parent.specServiceName']").removeAttr("name");
 						$(this).find("[name='businessType']").removeAttr("name");
+						$(this).find("[name='specServiceCode']").removeAttr("name");
 					}else{
 						var cfgType=$(this).attr("cfgType");
 						if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){
@@ -91,7 +92,7 @@
 						}
 					}
 				});
-				$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
+				//$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
 				$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
 				$(".protocol_desc").html('<spring:message code="app_desc"/>:');
 			}else{
@@ -101,6 +102,7 @@
 						$(this).find("[name='parent.specServiceId']").removeAttr("name");
 						$(this).find("[name='parent.specServiceName']").removeAttr("name");
 						$(this).find("[name='businessType']").removeAttr("name");
+						$(this).find("[name='specServiceCode']").removeAttr("name");
 					}else{
 						var cfgType=$(this).attr("cfgType");
 						if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){
@@ -112,15 +114,15 @@
 					}
 				});
 				if($("[name='cfgType']").val()==1){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
 					$(".protocol_desc").html('<spring:message code="app_desc"/>:');
 				}else if($("[name='cfgType']").val()==2){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="tunnel_name"/>:');
 					$(".protocol_desc").html('<spring:message code="tunnel_desc"/>:');
 				}else{
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="protocol_name"/>:');
 					$(".protocol_desc").html('<spring:message code="protocol_desc"/>:');
 				}
@@ -133,6 +135,7 @@
 						$("#specificServiceCfg"+cfgType+"Id").attr("name","parent.specServiceId");
 						$("#specificServiceCfg"+cfgType+"Name").attr("name","parent.specServiceName");
 						$("#businessType"+cfgType).attr("name","businessType");
+						$("#specServiceCode"+cfgType).attr("name","specServiceCode");
 						if($(this).hasClass("businessType")){
 							var parentId=$("#specificServiceCfg"+cfgType+"Id").val();
 							if(parentId!=0){
@@ -152,15 +155,15 @@
 					}
 				});
 				if(cfgType==1){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
 					$(".protocol_desc").html('<spring:message code="app_desc"/>:');
 				}else if(cfgType==2){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="tunnel_name"/>:');
 					$(".protocol_desc").html('<spring:message code="tunnel_desc"/>:');
 				}else{
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="protocol_name"/>:');
 					$(".protocol_desc").html('<spring:message code="protocol_desc"/>:');
 				}
@@ -278,6 +281,33 @@
 															</c:if>
 															<div for="businessType"></div>
 														</div>
+														<c:if test="${dict.itemCode==1}">
+														<div class="form-group cfgType specServiceCode">
+															<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_code"/>:</label>
+															<div class="col-md-4">
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+															</div>
+															<div for="specServiceCode"></div>
+														</div> 
+														</c:if>
+														<c:if test="${dict.itemCode==2}">
+														<div class="form-group cfgType">
+															<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label>
+															<div class="col-md-4">
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+															</div>
+															<div for="specServiceCode"></div>
+														</div> 
+														</c:if>
+														<c:if test="${dict.itemCode==3}">
+														<div class="form-group cfgType">
+															<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="tunnel_code"/>:</label>
+															<div class="col-md-4">
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+															</div>
+															<div for="specServiceCode"></div>
+														</div> 
+														</c:if>
 													</c:forEach>
 												    <div class="form-group">
 														<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label>

src/main/webapp/static/global/scripts/common.js

@@ -344,8 +344,8 @@ $(function(){
 	td需要配置属性有，functionId，compileId，action
     */
    $("td[compileId]").each(function(){
-	   	var audit=$(this).prev().find("span").data("audit");
-	   	if(audit == "approved"){
+	   	var audit=$(this).attr("audit");
+	   	if(audit == 1){
 	   		var data={};
 			data.date=new Date();
 			data.compileId=$(this).attr("compileId");