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

修正部分业务配置自定义域位置，特殊处理ip drop业务

Browse Source
This commit is contained in:
zhangwei
2018-11-29 18:46:35 +08:00
parent 4f1bfc33f1
commit 14461b8cb9
4 changed files with 128 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,7 @@ public interface ConfigSynchronizationDao {
public List<DnsResStrategy> getDnsStrategyList(BaseCfg entity);
public List<DnsIpCfg> getDnsIpCfgList(BaseCfg entity);
public List<IpPortCfg> getIpPortListByService(BaseCfg entity);
public List<IpPortCfg> getIpDropList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
public List<AppPolicyCfg> getAppPolicyList(BaseCfg entity);
public List<AppFeatureIndex> getAppFeatureIndexList(BaseCfg entity);

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

@@ -744,8 +744,24 @@
a.antiddos_protocol,a.bps_threadshold
</sql>
<sql id="IpCfg_Column" >
a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
</sql>
<sql id="IpCfg_AllColumn" >
a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_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.do_log,a.dns_strategy_id,a.user_region1,a.user_region2,
a.user_region3,a.user_region4,a.user_region5,
a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type
</sql>
<sql id="IpDropCfg_Column" >
a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_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.user_region1,a.user_region2,
a.user_region3,a.user_region4,a.user_region5,
a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type
</sql>
<sql id="AsnIpCfg_Column" >
a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -979,6 +995,17 @@
</foreach>
</where>
</select>
<select id="getIpDropList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
SELECT
<include refid="IpDropCfg_Column" />
FROM ${tableName} a
<where>
and a.compile_id in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</where>
</select>
<select id="getAppIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
SELECT
<include refid="AppIpCfg_Column" />
@@ -1217,12 +1244,7 @@
</select>
<select id="getIpPortListByService" resultMap="ipPortMap" >
select
a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
a.service_id,a.request_id,a.is_area_effective,a.classify,a.attribute,a.lable,
a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
a.user_region3,a.user_region4,a.user_region5,
<include refid="IpCfg_Column"></include>
<include refid="IpCfg_AllColumn"></include>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,u.name as auditor_name
<if test="serviceId==1028">