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" > <sql id="AsnIpCfg_Column" >
a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port 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.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>
<sql id="StrCfg_Column" > <sql id="StrCfg_Column" >
a.cfg_keywords,a.cfg_type, a.cfg_keywords,a.cfg_type,
@@ -1218,11 +1218,14 @@
<select id="getIpPortListByService" resultMap="ipPortMap" > <select id="getIpPortListByService" resultMap="ipPortMap" >
select 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> <include refid="IpCfg_Column"></include>
<trim prefix="," prefixOverrides=","> <trim prefix="," prefixOverrides=",">
,s.name as creator_name,u.name as auditor_name ,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 ,a.app_code,a.spec_service_id,a.behav_code
</if> </if>
</trim> </trim>
@@ -1270,11 +1273,22 @@
</select> </select>
<select id="getStrListByService" resultMap="stringCfgMap" > <select id="getStrListByService" resultMap="stringCfgMap" >
select 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,
<include refid="StrCfg_Column"></include> 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=","> <trim prefix="," prefixOverrides=",">
,s.name as creator_name,u.name as auditor_name ,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 ,a.app_code,a.spec_service_id,a.behav_code
</if> </if>
</trim> </trim>
@@ -1298,11 +1312,14 @@
</select> </select>
<select id="getComplexStrListByService" resultMap="complexCfgMap" > <select id="getComplexStrListByService" resultMap="complexCfgMap" >
select 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> <include refid="ComplexCfg_Column"></include>
<trim prefix="," prefixOverrides=","> <trim prefix="," prefixOverrides=",">
,s.name as creator_name,u.name as auditor_name ,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 ,a.app_code,a.spec_service_id,a.behav_code
</if> </if>
</trim> </trim>

26
src/main/resources/service/service_config.xml
View File

@@ -268,42 +268,42 @@
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion> <userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion> <userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service> </service>
<service id="145" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="APP监测"> <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="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion> <userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion> <userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1056" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="APP限速"> <service id="1056" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="APP限速">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion> <userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion> <userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service> </service>
<service id="36" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="隧道协议行为封堵"> <service id="36" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="隧道协议行为封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion> <userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion> <userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service> </service>
<service id="148" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="隧道协议行为监测"> <service id="148" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="隧道协议行为监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion> <userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion> <userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1060" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="隧道协议行为限速"> <service id="1060" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg" desc="隧道协议行为限速">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion> <userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion> <userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1028" functionId="405" serviceType="1" cfgType="1" tableName="app_ip_cfg" className="AppIpCfg" desc="APP IP特征"> <service id="1028" functionId="405" serviceType="1" cfgType="1" tableName="app_ip_cfg" className="AppIpCfg" desc="APP IP特征">
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
@@ -316,11 +316,11 @@
<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="1"></userRegion> <userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1026" functionId="403" serviceType="1" tableName="app_domain_cfg" className="AppDomainCfg" desc="APP 域名特征"> <service id="1026" functionId="403" serviceType="1" cfgType="2" tableName="app_domain_cfg" className="AppDomainCfg" desc="APP 域名特征">
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="DOMAIN_ID" regionColumn="compileId" userRegionPosition="1"></userRegion> <userRegion regionKey="DOMAIN_ID" regionColumn="compileId" userRegionPosition="0"></userRegion>
<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords" userRegionPosition="1"></userRegion> <userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords" userRegionPosition="1"></userRegion>
</service> </service>
<service id="1029" functionId="402" serviceType="1" cfgType="3" tableName="app_ssl_cert_cfg" className="AppSslCertCfg" desc="APP SSL单特征"> <service id="1029" functionId="402" serviceType="1" cfgType="3" tableName="app_ssl_cert_cfg" className="AppSslCertCfg" desc="APP SSL单特征">
@@ -331,28 +331,28 @@
<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="1"></userRegion> <userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1025" functionId="563" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex" desc="APP Payload组合特征"> <service id="1025" functionId="563" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex" desc="APP Payload组合特征">
<serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="1"></userRegion> <userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1027" functionId="563" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex" desc="APP DNS组合特征"> <service id="1027" functionId="563" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex" desc="APP DNS组合特征">
<serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="1"></userRegion> <userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1030" functionId="567" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex" desc="APP DK组合特征"> <service id="1030" functionId="567" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex" desc="APP DK组合特征">
<serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg> <serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="1"></userRegion> <userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service> </service>
<!-- APP、基础协议、 加密协议行为配置结束--> <!-- APP、基础协议、 加密协议行为配置结束-->