From a30bd855dd4145d7b6b6db4533743648c71559f2 Mon Sep 17 00:00:00 2001 From: DuanDongmei Date: Sat, 8 Dec 2018 17:54:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=97=A5=E5=BF=97scenefile?= =?UTF-8?q?=E5=92=8Chttp=E7=9A=84req=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAadmin=E6=89=8D=E5=8F=AF=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E3=80=82=20=E5=85=A8=E9=87=8F=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E5=8F=8A=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=AF=E4=BF=A1=E8=AF=81=E4=B9=A6=E4=B8=9A=E5=8A=A1=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/BaseController.java | 11 ++++- .../web/dao/configuration/CommonPolicyDao.xml | 45 +++++++++++-------- .../ConfigSynchronizationDao.java | 1 + .../ConfigSynchronizationDao.xml | 12 +++++ .../configuration/CommonPolicyService.java | 7 ++- .../ConfigSynchronizationService.java | 17 ++++++- .../20181208/update_voip_regioncode_dict.sql | 6 +++ .../views/log/manipulation/dkBehaviorList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/appList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/bgpList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/dnsList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/ftpList.jsp | 4 +- .../WEB-INF/views/log/ntc/httpKeyList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 18 ++++---- .../webapp/WEB-INF/views/log/ntc/ipList.jsp | 4 +- .../WEB-INF/views/log/ntc/ipsecList.jsp | 4 +- .../WEB-INF/views/log/ntc/irDnatLogList.jsp | 4 +- .../WEB-INF/views/log/ntc/irSnatLogList.jsp | 4 +- .../WEB-INF/views/log/ntc/l2tpLogList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmAvIpList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmAvUrlList.jsp | 4 +- .../views/log/ntc/mmFileDigestList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmPicIpList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmPicUrlList.jsp | 4 +- .../views/log/ntc/mmPornAudioSampleList.jsp | 4 +- .../views/log/ntc/mmPornVideoSampleList.jsp | 4 +- .../views/log/ntc/mmSampleAudioList.jsp | 4 +- .../views/log/ntc/mmSampleFaceList.jsp | 4 +- .../views/log/ntc/mmSampleLogoList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 4 +- .../views/log/ntc/mmSampleSpeakerList.jsp | 4 +- .../views/log/ntc/mmSampleVideoList.jsp | 4 +- .../views/log/ntc/mmSampleVoipList.jsp | 4 +- .../views/log/ntc/mmVoipAccountList.jsp | 4 +- .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 4 +- .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 4 +- .../WEB-INF/views/log/ntc/openVpnList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/p2pList.jsp | 4 +- .../WEB-INF/views/log/ntc/pptpLogList.jsp | 4 +- .../webapp/WEB-INF/views/log/ntc/sshList.jsp | 4 +- .../WEB-INF/views/log/ntc/sslLogList.jsp | 2 +- .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 4 +- 44 files changed, 157 insertions(+), 102 deletions(-) create mode 100644 src/main/resources/sql/20181208/update_voip_regioncode_dict.sql diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 2aedcbd31..098c4c729 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2636,9 +2636,18 @@ public class BaseController { cfg.setIsValid(entity.getIsValid()); cfg.setAuditTime(entity.getAuditTime()); newList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); - //TODO 要保证cert下发成功crl必须也同时下发成功,需要单个查询 ids.add(cfg.getCompileId()); } + if(!StringUtil.isEmpty(ids)) { + list=new ArrayList<>(); + list=commonPolicyService.getPxyObjTrustedCrlCfgListByCertId(ids); + for(int i=0;i - - and user_region1 in - - #{compileId} - - - - and asn_ip_group in - - #{compileId} - - - - and compile_id in - - #{compileId} - - - + + + and user_region1 in + + #{compileId} + + + + and asn_ip_group in + + #{compileId} + + + + and cert_id in + + #{compileId} + + + + and compile_id in + + #{compileId} + + + diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java index d3793a831..6654b272d 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java @@ -83,6 +83,7 @@ public interface ConfigSynchronizationDao { public List getPxyObjKeyringCfgList(BaseCfg entity); public List getPxyObjTrustedCertCfgList(BaseCfg entity); public List getPxyObjTrustedCrlCfgList(BaseCfg entity); + public List getPxyObjTrustedCrlCfgListByCertId(@Param("certIds")List certIds); public List getDnsStrategyList(BaseCfg entity); public List getDnsIpCfgList(BaseCfg entity); public List getIpPortListByService(BaseCfg entity); diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml index 1a5d6eb58..b68e07106 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml @@ -1165,9 +1165,21 @@ and a.is_valid=#{isValid} and a.is_audit=#{isAudit} and a.is_valid!=-1 + and (cert_id is null or cert_id == 0) ORDER BY a.CFG_ID +