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

控制策略修改userregion默认值为0

Browse Source 
DNS响应策略：所属组：不能为空
IP欺骗：所属组：可以选择缺省组
ip复用地址池：所属组：非空不能选0组
Dns：策略，默认选择无策略
修改HTTP管控，当没有选择时，响应内容可空
This commit is contained in:
duandongmei
2018-07-26 14:36:27 +08:00
parent 597be30b90
commit 74bc7dc42f
12 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
View File

@@ -52,10 +52,10 @@
<include refid="columns"></include>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName,dns.cfg_Desc as dns_strategy_name
,ri.request_title as requestName,dns.group_name as dns_strategy_name
</trim>
from dns_ip_cfg r
left join dns_res_strategy dns on dns.cfg_Id=r.dns_strategy_id
left join policy_group_info dns on dns.group_id=r.dns_strategy_id
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
left join sys_user u on r.auditor_id=u.id
@@ -71,7 +71,7 @@
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="dnsStrategyName != null and dnsStrategyName != ''">
AND dns.cfg_desc like concat(concat('%',#{dnsStrategyName,jdbcType=VARCHAR}),'%')
AND dns.group_name like concat(concat('%',#{dnsStrategyName,jdbcType=VARCHAR}),'%')
</if>
<if test="cfgRegionCode != null">
AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}

15
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -419,12 +419,13 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
if(entity.getAction().equals(16)){
if(!StringUtil.isEmpty(entity.getUserRegion1())){
userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+entity.getUserRegion1();
if(!StringUtil.isEmpty(entity.getUserRegion2())){
userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+entity.getUserRegion2();
}else{
userRegion="";
}
}
if(!StringUtil.isEmpty(entity.getUserRegion2())){
userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+entity.getUserRegion2();
}else{
userRegion="";
}
}
//HTTP redirect
if(entity.getAction().equals(48)){
@@ -460,7 +461,9 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
}
}
if(StringUtil.isEmpty(userRegion)){
userRegion=Constants.USER_REGION_PLACEHOLDER;
}
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);