From c9d7512a1ba068159accb3a13a0ec4ab0013db2c Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Sun, 27 Jan 2019 12:03:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E9=85=8D=E7=BD=AE=E3=80=81IP=E5=88=86=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81DNS=E5=88=86=E7=BB=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA=E9=BB=91=E5=B1=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/dao/basics/PolicyGroupInfoDao.xml | 14 ++-- .../web/dao/configuration/CommonPolicyDao.xml | 2 +- .../configuration/CachePolicyService.java | 81 ++++++++++--------- 3 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml index 54db24a59..edaba3469 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml @@ -251,18 +251,20 @@ - - SELECT , s.name as creator_name ,e.name as editor_name - 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}) diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index 70564e398..ac7350980 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -65,7 +65,7 @@ - + diff --git a/src/main/java/com/nis/web/service/configuration/CachePolicyService.java b/src/main/java/com/nis/web/service/configuration/CachePolicyService.java index 355363033..77bedde08 100644 --- a/src/main/java/com/nis/web/service/configuration/CachePolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/CachePolicyService.java @@ -77,29 +77,32 @@ public class CachePolicyService extends CrudService entity.setPage(page); List 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 public List getCachePolicyByUserRegionList(String ids){ List 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 if(!cookie.equals("null") && cookie!=null){ c.setCookie(cookie); } - } + } + } } return list; }