1.修改配置同步业务；

2.修改ip payload日志表头与代理日志的数据列隐藏

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

@@ -35,6 +35,7 @@ import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.FileDigestCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.PxyObjKeyring;
+import com.nis.domain.configuration.PxyObjSpoofingIpPool;
 import com.nis.domain.configuration.PxyObjTrustedCaCert;
 import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.configuration.WebsiteDomainTopic;
@@ -88,6 +89,7 @@ public interface ConfigSynchronizationDao {
 	public List<DnsIpCfg> getDnsIpCfgList(BaseCfg entity);
 	public List<IpPortCfg> getIpPortListByService(BaseCfg entity);
 	public List<IpPortCfg> getIpDropList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
+	List<PxyObjSpoofingIpPool> getSpoofingIpPoolList(BaseCfg entity);
 	
 	public List<AppPolicyCfg> getAppPolicyList(BaseCfg entity);
 	public List<AppFeatureIndex> getAppFeatureIndexList(BaseCfg entity);

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

@@ -877,6 +877,13 @@
     a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
   </sql>
+   <sql id="PxyObjSpoofingIpPoolColumns">
+		 a.CFG_ID, a.CFG_DESC,a.CFG_REGION_CODE, a.IP_TYPE, a.IP_ADDRESS,
+		 a.DIRECTION,a.PROTOCOL,a.IS_VALID,a.IS_AUDIT,a.location,a.port,
+    a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
+    a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.FUNCTION_ID,a.GROUP_ID,a.user_region
+	</sql>
   <!-- <sql id="WebsiteDomainTopic_Column">
 		id,website_service_id websiteServiceId,domain,topic_id topicId,create_time createTime,creator_id creatorId,is_valid isValid
   </sql>
@@ -1452,6 +1459,15 @@
 	    </trim>
 		ORDER BY a.CFG_ID
   </select>
+  
+  <select id="getSpoofingIpPoolList" resultType="com.nis.domain.configuration.PxyObjSpoofingIpPool" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		SELECT
+			<include refid="PxyObjSpoofingIpPoolColumns"/>
+	    FROM pxy_obj_spoofing_ip_pool a where a.is_valid=1 and a.is_audit=1
+	   	 <if test="cfgId != null">
+   			AND a.CFG_ID!=#{cfgId,jdbcType=BIGINT}
+   		</if>
+	</select>
   <!-- <select id="findAppPolicyList" resultMap="AppPolicyCfgMap" parameterType="com.nis.domain.configuration.AppPolicyCfg" >
 		select 
 		<include refid="AppPolicyCfg_Column"/>	

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

@@ -38,6 +38,7 @@ import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.FileDigestCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.PxyObjKeyring;
+import com.nis.domain.configuration.PxyObjSpoofingIpPool;
 import com.nis.domain.configuration.PxyObjTrustedCaCert;
 import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.configuration.WebsiteDomainTopic;
@@ -1737,6 +1738,9 @@ public class ConfigSynchronizationService  extends BaseService{
 					IpPortCfg cfg = (IpPortCfg) list.get(i);
 					newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
 				}
+			}else if(className.equals("PxyObjSpoofingIpPool")){
+				list = configSynchronizationDao.getSpoofingIpPoolList(entity);
+				newList.addAll(list);
 			}
 		}
 		

src/main/resources/service/service_config.xml

@@ -14,24 +14,33 @@
 	    <serviceCfg cfgType="1" tableName="asn_ip_cfg"  groupReuse="true" groupId="userRegion4"></serviceCfg>
 	    <userRegion regionKey="ASN_ID" regionColumn="userRegion5"  userRegionPosition="0"></userRegion>
 	</service>
-	<service id="149" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN监测">
+	<!-- <service id="149" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="ASN监测">
 	    	<serviceCfg cfgType="1" tableName="asn_ip_cfg"  groupReuse="true" groupId="userRegion4"></serviceCfg>
 	    	<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0"  ></userRegion>
-	</service>
+	</service> -->
 	<service id="3" functionId="5" serviceType="2" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃">
 	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 	</service>
-	<service id="514" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP限速">
+	<!-- <service id="514" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP限速">
 	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 	    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>
-	</service>
+	</service> -->
 	<service id="517" functionId="212" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP Payload">
 	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 	    	<serviceCfg cfgType="2" tableName="intercept_pkt_bin" ></serviceCfg>
 	    	<userRegion regionKey="zone" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
 	    	<userRegion regionKey="substitute" regionColumn="userRegion2,userRegion3"  userRegionPosition="0"></userRegion>
 	</service>
-	<service id="2" functionId="6" serviceType="1" tableName="cfg_index_info"  className="CfgIndexInfo" desc="URL表名单">
+	<!-- IP Spoofing的地址IP池 回调类配置 -->
+	<service id="642" functionId="666" serviceType="2" tableName="pxy_obj_spoofing_ip_pool" className="PxyObjSpoofingIpPool" desc="IP Spoofing Pool"></service>
+	
+	<service id="518" functionId="214" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP Spoofing">
+	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
+	    	<serviceCfg cfgType="2" tableName="intercept_pkt_bin" ></serviceCfg>
+	    	<userRegion regionKey="zone" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
+	    	<userRegion regionKey="substitute" regionColumn="userRegion2,userRegion3"  userRegionPosition="0"></userRegion>
+	</service>
+	<service id="2" functionId="6" serviceType="1" tableName="cfg_index_info"  className="CfgIndexInfo" desc="URL白名单">
     	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
 	</service>
     <!-- <service id="129" functionId="6" serviceType="1" tableName="cfg_index_info"  className="CfgIndexInfo">
@@ -176,23 +185,25 @@
 	</service>
 	<service id="512" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截监测">
     	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
+    	<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
     	<userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0" ></userRegion>
+    	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"   userRegionPosition="0"></userRegion>
+    	<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords"  userRegionPosition="2"></userRegion>
+    	<userRegion regionKey="intensity" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
 	</service>
-	<!-- <service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
+	<!-- <service id="513" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截监测">
-    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-	</service> -->
-	<service id="513" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截监测">
     	<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
     	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"   userRegionPosition="0"></userRegion>
     	<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords"  userRegionPosition="2"></userRegion>
     	<userRegion regionKey="keyring_id" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
     	<userRegion regionKey="intensity" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
-	</service>
+	</service> -->
 	<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP或域名拦截白名单">
     	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
     	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
 	</service>
-	<service id="515" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="域名拦截限速">
+	<service id="514" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="域名拦截限速">
+		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
     	<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
     	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"  userRegionPosition="0"></userRegion>
     	<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords"  userRegionPosition="2"></userRegion>
@@ -255,29 +266,34 @@
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="PROTO_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="147" functionId="407" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="基础协议监测">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="PROTO_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1059" functionId="407" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="基础协议限速">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="PROTO_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
 		<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+		<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="33" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="APP封堵">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="145" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="APP监测">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1056" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="APP限速">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
@@ -285,18 +301,21 @@
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="36" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="隧道协议行为封堵">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="148" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="隧道协议行为监测">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="config_id" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1060" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="隧道协议行为限速">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>

src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp

@@ -31,7 +31,13 @@ $(document).ready(function(){
 	<div class="theme-panel hidden-xs hidden-sm">
 	</div>
 	<h3 class="page-title">
-	<spring:message code="spoofing_ip_policy"/>
+		<c:if test="${log.functionId == 214}">
+	     <spring:message code="spoofing_ip_policy"/>
+	   </c:if>
+	   <c:if test="${log.functionId == 212}">
+	      <spring:message code="ip_payload"/>
+	   </c:if>
+	   
 	</h3>
 	
 	<h5 class="page-header"></h5>

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -227,6 +227,7 @@
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id" ><spring:message code="entrance_id"/></th>
 								
 								<th class="sort-column url"> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+								<th class="sort-column website" column="website" ><spring:message code="website"/></th>
 								<c:if test="${fns:getUser().isAdmin()}">
 								<th class="sort-column req_line" column="req_line" ><spring:message code="req_line"/></th>
 								<th class="sort-column res_line" column="res_line" ><spring:message code="res_line"/></th>
@@ -237,11 +238,11 @@
 								<th class="sort-column content_len" column="content_len" ><spring:message code="content_len"/></th>
 								<th class="sort-column content_type" column="content_type" ><spring:message code="content_type"/></th>
 								<th class="sort-column set_cookie" column="set_cookie" ><spring:message code="set_cookie"/></th>
-								<th class="sort-column req_header" column="req_header" ><spring:message code="req_header"/></th>
+								<%-- <th class="sort-column req_header" column="req_header" ><spring:message code="req_header"/></th>
-								<th class="sort-column resp_header" column="resp_header" ><spring:message code="resp_header"/></th>
+								<th class="sort-column resp_header" column="resp_header" ><spring:message code="resp_header"/></th> --%>
 								<%-- <th class="sort-column req_body"><spring:message code="req_body"/></th>
 								<th class="sort-column res_body"><spring:message code="res_body"/></th> --%>
-								<th class="sort-column website" column="website" ><spring:message code="website"/></th>
+								
 								
 								<th class="sort-column cap_ip" isVisible="false" column="clj_ip" ><spring:message code="clj_ip"/></th>
 								<th class="sort-column trans_proto" column="transport_layer_protocol" ><spring:message code="transport_layer_protocol"/></th>
@@ -254,11 +255,11 @@
 								<th class="sort-column link_id" isVisible="false" column="link_id" ><spring:message code="link_id"/></th>
 								<th class="sort-column encap_type" column="encap_type" ><spring:message code="encap_type"/></th>
 								<th class="sort-column direction" column="direction" ><spring:message code="direction"/></th>
-								<th class="sort-column inner_smac" column="inner_smac" ><spring:message code="inner_smac"/></th>
+								<%-- <th class="sort-column inner_smac" column="inner_smac" ><spring:message code="inner_smac"/></th>
-								<th class="sort-column inner_dmac" column="inner_dmac" ><spring:message code="inner_dmac"/></th>
+								<th class="sort-column inner_dmac" column="inner_dmac" ><spring:message code="inner_dmac"/></th> --%>
 								<th class="sort-column stream_dir" column="stream_type" ><spring:message code="stream_type"/></th>
 								
-								<th class="sort-column addr_list" column="nest_addr_list" ><spring:message code="nest_addr_list"/></th>
+								<%-- <th class="sort-column addr_list" column="nest_addr_list" ><spring:message code="nest_addr_list"/></th> --%>
 								<th class="sort-column server_locate" column="server_locate" ><spring:message code='server_locate'/></th>
 								<th class="sort-column client_locate" column="client_locate" ><spring:message code='client_locate'/></th>
 								<th class="sort-column s_asn" isVisible="false" column="s_asn" ><spring:message code='s_asn'/></th>
@@ -308,6 +309,7 @@
 													http://${log.url}
 												</c:if> --%>
 								</td>
+								<td>${log.website }</td>
 								<c:if test="${fns:getUser().isAdmin()}">
 								<td>${log.reqLine }</td>
 								<td>${log.resLine }</td>
@@ -318,9 +320,9 @@
 								<td>${log.contentLen }</td>
 								<td>${log.contentType }</td>
 								<td>${log.setCookie }</td>
-								<td>${log.reqHeader }</td>
+								<%-- <td>${log.reqHeader }</td>
-								<td>${log.respHeader }</td>
+								<td>${log.respHeader }</td> --%>
-								<td>${log.website }</td>
+								
 								
 								<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 								<td>
@@ -381,8 +383,8 @@
 					                	</c:forEach>
 					                	<spring:message code="${directions}"/>
 									</td>
-									<td>${log.innerSmac }</td>
+									<%-- <td>${log.innerSmac }</td>
-									<td>${log.innerDmac }</td>
+									<td>${log.innerDmac }</td> --%>
 									<td>
 										<c:set var="streamDirs">${log.streamDir }</c:set>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
@@ -393,7 +395,7 @@
 					                	<spring:message code="${streamDirs}"/>
 									</td>
 									
-									<td>${log.addrList }</td>
+									<%-- <td>${log.addrList }</td> --%>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 									<td>${log.sAsn}</td>