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

所有日志scenefile和http的req相关内容修改为admin才可展示。

Browse Source 
全量下发及批量下发增加可信证书业务处理
This commit is contained in:
DuanDongmei
2018-12-08 17:54:59 +08:00
parent 178181478f
commit a30bd855dd
44 changed files with 157 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -745,25 +745,32 @@
,cancel_request_id = #{requestId,jdbcType=INTEGER}
</if>
<where>
<if test="tableName == 'app_ip_cfg'" >
and user_region1 in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</if>
<if test="tableName == 'asn_ip_cfg'" >
and asn_ip_group in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</if>
<if test="tableName != 'asn_ip_cfg' and tableName != 'app_ip_cfg'" >
and compile_id in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</if>
<choose>
<when test="tableName == 'app_ip_cfg'">
and user_region1 in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</when >
<when test=" tableName == 'asn_ip_cfg'">
and asn_ip_group in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</when >
<when test=" tableName == 'pxy_obj_trusted_ca_crl'">
and cert_id in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</when >
<otherwise>
and compile_id in
<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
#{compileId}
</foreach>
</otherwise>
</choose>
</where>
</if>
<if test="tableName == 'config_group_info'" >

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

@@ -83,6 +83,7 @@ public interface ConfigSynchronizationDao {
public List<PxyObjKeyring> getPxyObjKeyringCfgList(BaseCfg entity);
public List<PxyObjTrustedCaCert> getPxyObjTrustedCertCfgList(BaseCfg entity);
public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgList(BaseCfg entity);
public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgListByCertId(@Param("certIds")List certIds);
public List<DnsResStrategy> getDnsStrategyList(BaseCfg entity);
public List<DnsIpCfg> getDnsIpCfgList(BaseCfg entity);
public List<IpPortCfg> getIpPortListByService(BaseCfg entity);

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

@@ -1165,9 +1165,21 @@
</if>
and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
and a.is_valid!=-1
and (cert_id is null or cert_id == 0)
</trim>
ORDER BY a.CFG_ID
</select>
<select id="getPxyObjTrustedCrlCfgListByCertId" resultMap="PxyObjTrustedCaCrlMap" >
SELECT
<include refid="PxyObjTrustedCaCrlColumns"/>
FROM pxy_obj_trusted_ca_crl a
<where>
and cert_id in
<foreach collection="certIds" index="index" item="certId" open="(" separator="," close=")">
#{certId}
</foreach>
</where>
</select>
<select id="getPxyObjKeyringCfgList" resultMap="PxyObjKeyringMap" parameterType="com.nis.domain.configuration.BaseCfg" >
SELECT
<include refid="PxyObjKeyringColumns"/>