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

1.抽取配置域转换处理逻辑为方法；

Browse Source 
2.文件摘要类配置处理逻辑方法抽取；
3.修正业务配置文件；
4.配置同步json保存为文件。

Signed-off-by: zhangwei <zhangwei2@iie.ac.cn>
This commit is contained in:
zhangwei
2018-11-30 11:26:34 +08:00
parent da47832559
commit a4cea80688
4 changed files with 396 additions and 364 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

@@ -75,6 +75,7 @@ public interface ConfigSynchronizationDao {
public List<ComplexkeywordCfg> getComplexStrList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
public List<FileDigestCfg> getFileDigestList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
public List<DdosIpCfg> getDdosIpCfgList(BaseCfg entity);
public List<FileDigestCfg> getFileDigestListByService(BaseCfg entity);
public List<AvFileSampleCfg> getAvFileCfgList(BaseCfg entity);
public List<PxyObjKeyring> getPxyObjKeyringCfgList(BaseCfg entity);

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

@@ -777,7 +777,10 @@
a.expr_type,a.match_method,a.is_hexbin,a.compile_id
</sql>
<sql id="DigestCfg_Column" >
a.raw_len,a.digest,a.cfds_level,a.file_url,a.compile_id
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.user_region1,a.user_region2,
a.user_region3,a.user_region4,a.user_region5,a.raw_len,a.digest,a.cfds_level,a.file_url
</sql>
<sql id="PxyObjTrustedCaCertColumns">
a.cfg_id,a.cfg_desc
@@ -984,6 +987,31 @@
</trim>
ORDER BY a.CFG_ID
</select>
<select id="getFileDigestListByService" resultMap="digestCfgMap" parameterType="com.nis.domain.configuration.FileDigestCfg" >
SELECT
<include refid="DigestCfg_Column" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,u.name as auditor_name
</trim>
FROM file_digest_cfg a
left join sys_user s on a.creator_id=s.id
left join sys_user u on a.auditor_id=u.id
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="serviceId != null">
AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
</if>
<if test="functionId != null">
AND a.function_id=#{functionId,jdbcType=INTEGER}
</if>
<if test="action != null">
AND a.action=#{action,jdbcType=INTEGER}
</if>
and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
and a.is_valid!=-1
</trim>
ORDER BY a.CFG_ID
</select>
<select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
SELECT
<include refid="IpCfg_Column" />