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

修改单域配置的SQL语句，ASN IP查询SQL增加region_id字段，修正业务配置文件的自定义域错误等

Browse Source
This commit is contained in:
zhangwei
2018-11-29 11:02:36 +08:00
parent 9bd196547e
commit 0ef3d34fe4
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -750,7 +750,7 @@
<sql id="AsnIpCfg_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.asn_ip_group,
a.user_region1
a.user_region1,a.region_id
</sql>
<sql id="StrCfg_Column" >
a.cfg_keywords,a.cfg_type,
@@ -1218,11 +1218,14 @@
<select id="getIpPortListByService" resultMap="ipPortMap" >
select
<include refid="BaseCfg_Column"></include>,
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>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,u.name as auditor_name
<if test="serviceId=1028">
<if test="serviceId==1028">
,a.app_code,a.spec_service_id,a.behav_code
</if>
</trim>
@@ -1270,11 +1273,22 @@
</select>
<select id="getStrListByService" resultMap="stringCfgMap" >
select
<include refid="BaseCfg_Column"></include>,
<include refid="StrCfg_Column"></include>
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,
<choose>
<when test="serviceId==1026">
a.domain as cfg_keywords,
</when>
<otherwise>
a.cfg_keywords,
</otherwise>
</choose>
a.cfg_type, a.expr_type,a.match_method,a.is_hexbin,a.compile_id
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,u.name as auditor_name
<if test="serviceId=1024 or serviceId=1026 or serviceId=1029">
<if test="serviceId==1024 or serviceId==1026 or serviceId==1029">
,a.app_code,a.spec_service_id,a.behav_code
</if>
</trim>
@@ -1298,11 +1312,14 @@
</select>
<select id="getComplexStrListByService" resultMap="complexCfgMap" >
select
<include refid="BaseCfg_Column"></include>,
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="ComplexCfg_Column"></include>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,u.name as auditor_name
<if test="serviceId=1024 or serviceId=1026 or serviceId=1029">
<if test="serviceId==1024 or serviceId==1026 or serviceId==1029">
,a.app_code,a.spec_service_id,a.behav_code
</if>
</trim>