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

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

@@ -259,10 +259,12 @@
, s.name as creator_name
,e.name as editor_name
</trim>
FROM policy_group_info r
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})
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>

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

@@ -77,6 +77,7 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
entity.setPage(page);
List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyUserRegionList(entity);
for (CachePolicyUserRegion c : list) {
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());
@@ -101,6 +102,8 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
}
}
}
}
page.setList(list);
return page;
}
@@ -109,6 +112,7 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
public List<CachePolicyUserRegion> getCachePolicyByUserRegionList(String ids){
List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyByUserRegionList(ids);
for (CachePolicyUserRegion c : list) {
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());
@@ -133,6 +137,7 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
}
}
}
}
return list;
}