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

1.修改配置同步业务；

Browse Source 
2.修改ip payload日志表头与代理日志的数据列隐藏
This commit is contained in:
zhangwei
2018-12-30 12:11:20 +06:00
parent 6b433c4e5a
commit aa7e1dcef9
6 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
View File

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

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

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

4
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

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