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

(1)修复基础协议，app协议，加密隧道行为主配置被账号配置覆盖的bug

Browse Source 
(2)DNS配置下发时，只展示有审核通过的欺骗IP的DNS策略
This commit is contained in:
wangxin
2018-09-26 16:00:45 +08:00
parent 09baf72da3
commit 82a2e803ae
5 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.java
View File

@@ -14,5 +14,8 @@ public interface DnsResStrategyDao extends CrudDao<DnsResStrategy> {
List<DnsResStrategy> findList(@Param("cfgId")Long cfgId
,@Param("isAudit")Integer isAudit
,@Param("isValid")Integer isValid);
List<DnsResStrategy> findhasValidIpList(@Param("cfgId")Long cfgId
,@Param("isAudit")Integer isAudit
,@Param("isValid")Integer isValid);
}

31
src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
View File

@@ -164,6 +164,37 @@
</where>
order by cfg_Id
</select>
<!-- 查出所有 有效数据-->
<select id="findhasValidIpList" resultMap="DnsResStrategyMap">
SELECT
<include refid="DnsResStrategyColumns"/>
FROM (
SELECT DISTINCT dns_strategy_id FROM dns_ip_cfg WHERE is_valid=1 AND is_audit=1
) a
LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id
<where>
<if test="isValid == -1">
AND r.is_valid !=-1
</if>
<if test="isValid == 1">
AND r.is_valid =1
</if>
<if test="isValid == 0">
AND r.is_valid =0
</if>
<if test="isAudit == 0">
AND r.is_audit =0
</if>
<if test="isAudit == 1">
AND r.is_audit =1
</if>
<if test="cfgId != null">
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
</if>
<![CDATA[ and r.cfg_id <> 0]]>
</where>
order by r.cfg_Id
</select>
<insert id="insert" parameterType="com.nis.domain.configuration.DnsResStrategy" >
insert into dns_res_strategy (
CFG_DESC,