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

修复缓存策略配置、IP分组管理、DNS分组管理导出黑屏bug

Browse Source 
(cherry picked from commit c9d7512a1b)
This commit is contained in:
zhangwenqing
2019-01-27 04:03:39 +00:00
committed by 王鑫
parent e33e91cb46
commit faf8f45585
3 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
View File

@@ -251,18 +251,20 @@
</trim>
</select>
<!-- 查出所有 有效数据-->
<select id="findPolicyByGroupInfoList" resultMap="PolicyGroupInfoMap">
<!-- 查出所有 有效数据-->
<select id="findPolicyByGroupInfoList" resultMap="PolicyGroupInfoMap">
SELECT
<include refid="PolicyGroupInfoColumns"/>
<trim prefix="," prefixOverrides=",">
, s.name as creator_name
,e.name as editor_name
</trim>
FROM policy_group_info r
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
where r.CFG_ID in (${ids})
FROM
policy_group_info r
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
WHERE
r.group_id IN (${ids})
</select>

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

@@ -65,7 +65,7 @@
<result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
<result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
<result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
<!-- <result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" /> -->
<result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap>

81
src/main/java/com/nis/web/service/configuration/CachePolicyService.java
View File

@@ -77,29 +77,32 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
entity.setPage(page);
List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyUserRegionList(entity);
for (CachePolicyUserRegion c : list) {
JSONObject jsonObject=JSONObject.fromObject(c.getUserRegion1());
CachePolicyUserRegion stu=(CachePolicyUserRegion)JSONObject.toBean(jsonObject, CachePolicyUserRegion.class);
c.setCache_cookied_cont(stu.getCache_cookied_cont());
c.setCache_dyn_url(stu.getCache_dyn_url());
c.setForce_caching(stu.getForce_caching());
c.setIgnore_req_nocache(stu.getIgnore_req_nocache());
c.setIgnore_res_nocache(stu.getIgnore_res_nocache());
c.setInactive_time(stu.getInactive_time());
c.setMax_cache_obj_size(stu.getMax_cache_obj_size());
c.setMax_cache_size(stu.getMax_cache_size());
c.setMin_use(stu.getMin_use());
c.setNo_revalidate(stu.getNo_revalidate());
c.setPinning_time(stu.getPinning_time());
if(stu.getCache_key()!=null){
String ignore=String.valueOf(stu.getCache_key().get("ignore_qs"));
String cookie=String.valueOf(stu.getCache_key().get("cookie"));
if(!ignore.equals("null") && ignore!=null){
c.setIgnore_qs(ignore);
}
if(!cookie.equals("null") && cookie!=null){
c.setCookie(cookie);
}
}
if(!StringUtil.isBlank(c.getUserRegion1())) { // action为缓存白名单时 userRegion1 为null
JSONObject jsonObject=JSONObject.fromObject(c.getUserRegion1());
CachePolicyUserRegion stu=(CachePolicyUserRegion)JSONObject.toBean(jsonObject, CachePolicyUserRegion.class);
c.setCache_cookied_cont(stu.getCache_cookied_cont());
c.setCache_dyn_url(stu.getCache_dyn_url());
c.setForce_caching(stu.getForce_caching());
c.setIgnore_req_nocache(stu.getIgnore_req_nocache());
c.setIgnore_res_nocache(stu.getIgnore_res_nocache());
c.setInactive_time(stu.getInactive_time());
c.setMax_cache_obj_size(stu.getMax_cache_obj_size());
c.setMax_cache_size(stu.getMax_cache_size());
c.setMin_use(stu.getMin_use());
c.setNo_revalidate(stu.getNo_revalidate());
c.setPinning_time(stu.getPinning_time());
if(stu.getCache_key()!=null){
String ignore=String.valueOf(stu.getCache_key().get("ignore_qs"));
String cookie=String.valueOf(stu.getCache_key().get("cookie"));
if(!ignore.equals("null") && ignore!=null){
c.setIgnore_qs(ignore);
}
if(!cookie.equals("null") && cookie!=null){
c.setCookie(cookie);
}
}
}
}
page.setList(list);
return page;
@@ -109,20 +112,21 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
public List<CachePolicyUserRegion> getCachePolicyByUserRegionList(String ids){
List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyByUserRegionList(ids);
for (CachePolicyUserRegion c : list) {
JSONObject jsonObject=JSONObject.fromObject(c.getUserRegion1());
CachePolicyUserRegion stu=(CachePolicyUserRegion)JSONObject.toBean(jsonObject, CachePolicyUserRegion.class);
c.setCache_cookied_cont(stu.getCache_cookied_cont());
c.setCache_dyn_url(stu.getCache_dyn_url());
c.setForce_caching(stu.getForce_caching());
c.setIgnore_req_nocache(stu.getIgnore_req_nocache());
c.setIgnore_res_nocache(stu.getIgnore_res_nocache());
c.setInactive_time(stu.getInactive_time());
c.setMax_cache_obj_size(stu.getMax_cache_obj_size());
c.setMax_cache_size(stu.getMax_cache_size());
c.setMin_use(stu.getMin_use());
c.setNo_revalidate(stu.getNo_revalidate());
c.setPinning_time(stu.getPinning_time());
if(stu.getCache_key()!=null){
if(!StringUtil.isBlank(c.getUserRegion1())) { // action为缓存白名单时 userRegion1 为null
JSONObject jsonObject=JSONObject.fromObject(c.getUserRegion1());
CachePolicyUserRegion stu=(CachePolicyUserRegion)JSONObject.toBean(jsonObject, CachePolicyUserRegion.class);
c.setCache_cookied_cont(stu.getCache_cookied_cont());
c.setCache_dyn_url(stu.getCache_dyn_url());
c.setForce_caching(stu.getForce_caching());
c.setIgnore_req_nocache(stu.getIgnore_req_nocache());
c.setIgnore_res_nocache(stu.getIgnore_res_nocache());
c.setInactive_time(stu.getInactive_time());
c.setMax_cache_obj_size(stu.getMax_cache_obj_size());
c.setMax_cache_size(stu.getMax_cache_size());
c.setMin_use(stu.getMin_use());
c.setNo_revalidate(stu.getNo_revalidate());
c.setPinning_time(stu.getPinning_time());
if(stu.getCache_key()!=null){
String ignore=String.valueOf(stu.getCache_key().get("ignore_qs"));
String cookie=String.valueOf(stu.getCache_key().get("cookie"));
if(!ignore.equals("null") && ignore!=null){
@@ -131,7 +135,8 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
if(!cookie.equals("null") && cookie!=null){
c.setCookie(cookie);
}
}
}
}
}
return list;
}