From 1d711fac73288cfbef569571c56c17608c5c77ef Mon Sep 17 00:00:00 2001 From: duandongmei Date: Tue, 30 Oct 2018 13:34:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=A4=B1=E6=95=88=EF=BC=8C=E7=9B=B8=E5=85=B3url=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AEbug=E6=9B=B4=E6=94=B9=20=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E9=85=8D=E7=BD=AE=E5=BF=85=E9=A1=BB=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/WebsiteCfgService.java | 54 +------------------ .../include/form/multiHttpUrlModal.jsp | 16 ++++++ 2 files changed, 18 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index c197d9eed..0bd885663 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -597,7 +597,7 @@ public class WebsiteCfgService extends CrudService { if(cfgIndexInfo.getIsAudit().equals(1)){ cfgIndexInfo.setTableName(CfgIndexInfo.getTablename()); cfgIndexInfo.setAuditorId(UserUtils.getUser().getId()); - cfgIndexInfo.setAuditTime(maatCfgBody.getAuditTime()); + cfgIndexInfo.setAuditTime(cfgHttpBody.getAuditTime()); cfgIndexInfo.setIsAudit(3); cfgIndexInfo.setIsValid(0); //设置配置取消的来函信息 @@ -608,7 +608,7 @@ public class WebsiteCfgService extends CrudService { for (BaseStringCfg httpUrlCfg : httpUrlList) { httpUrlCfg.setTableName(HttpUrlCfg.getTablename()); httpUrlCfg.setAuditorId(UserUtils.getUser().getId()); - httpUrlCfg.setAuditTime(maatCfgBody.getAuditTime()); + httpUrlCfg.setAuditTime(cfgHttpBody.getAuditTime()); httpUrlCfg.setIsAudit(3); httpUrlCfg.setIsValid(0); websiteCfgDao.auditCfg(httpUrlCfg); @@ -641,56 +641,6 @@ public class WebsiteCfgService extends CrudService { } } - /* - List httpUrlList=websiteCfgDao.getHttpUrlList(cfg); - if(!StringUtil.isEmpty(httpUrlList)){}{ - for (BaseStringCfg httpUrlCfg : httpUrlList) { - //失效中间表 - CfgIndexInfo entity=new CfgIndexInfo(); - entity.setTableName(CfgIndexInfo.getTablename()); - entity.setFunctionId(6); - entity.setCompileId(httpUrlCfg.getCompileId()); - httpUrlCfg.setTableName(HttpUrlCfg.getTablename()); - //审核通过的，失效 3 0 - if(httpUrlCfg.getIsAudit().equals(1)){ - entity.setAuditorId(UserUtils.getUser().getId()); - entity.setAuditTime(maatCfgBody.getAuditTime()); - entity.setIsAudit(3); - entity.setIsValid(0); - - httpUrlCfg.setAuditorId(UserUtils.getUser().getId()); - httpUrlCfg.setAuditTime(maatCfgBody.getAuditTime()); - httpUrlCfg.setIsAudit(3); - httpUrlCfg.setIsValid(0); - - websiteCfgDao.auditCfg(entity); - websiteCfgDao.auditCfg(httpUrlCfg); - //serviceDictInfoDao.auditCancleRequestInfo(cancelRequestId, "cfg_index_info", entity); - }else if(!(httpUrlCfg.getIsAudit().equals(3) || httpUrlCfg.getIsValid().equals(-1))){ - //未审核和审核未通过，删除 0 -1 - entity.setEditorId(UserUtils.getUser().getId()); - entity.setEditTime(maatCfgBody.getAuditTime()); - entity.setIsAudit(0); - entity.setIsValid(-1); - - httpUrlCfg.setEditorId(UserUtils.getUser().getId()); - httpUrlCfg.setEditTime(maatCfgBody.getAuditTime()); - httpUrlCfg.setIsAudit(0); - httpUrlCfg.setIsValid(-1); - - websiteCfgDao.updateCfgValid(entity); - websiteCfgDao.updateCfgValid(httpUrlCfg); - - } - //只有审核通过的配置需要下发失效动作 - if(httpUrlCfg.getIsAudit().equals(3)){ - maatCfg.setCompileId(httpUrlCfg.getCompileId()); - maatCfg.setServiceId(httpUrlCfg.getServiceId()); - maatCfg.setIsValid(0);//无效 - httpUrlCompile.add(maatCfg); - } - } - }*/ return httpUrlCompile; } public void saveSslCfg(CfgIndexInfo entity){ diff --git a/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp b/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp index f72c6c8c1..d35644bc2 100644 --- a/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp @@ -142,6 +142,14 @@ $(function () { $("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#httpUrlRegion").val()); $("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#httpUrlRegion").attr("cfgRegionCode")); } + if(action == 1){ //白名单 + $("select[name='"+objNamePrefix+"doLog']").attr("value",1); + $("select[name='"+objNamePrefix+"doLog']").attr("disabled",true); + $("select[name='"+objNamePrefix+"doLog']").selectpicker("refresh"); + }else{ + $("select[name='"+objNamePrefix+"doLog']").attr("disabled",false); + $("select[name='"+objNamePrefix+"doLog']").selectpicker("refresh"); + } $("input[name='"+objNamePrefix+"serviceId']").attr("value",$(this).find("option:selected").attr("serviceId")); }); if(action == 128){ //白名单 @@ -151,6 +159,14 @@ $(function () { $("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#httpUrlRegion").val()); $("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#httpUrlRegion").attr("cfgRegionCode")); } + if(action == 1){ //白名单 + $("select[name='"+objNamePrefix+"doLog']").attr("value",1); + $("select[name='"+objNamePrefix+"doLog']").attr("disabled",true); + $("select[name='"+objNamePrefix+"doLog']").selectpicker("refresh"); + }else{ + $("select[name='"+objNamePrefix+"doLog']").attr("disabled",false); + $("select[name='"+objNamePrefix+"doLog']").selectpicker("refresh"); + } $("input[name='"+objNamePrefix+"serviceId']").attr("value",$(this).find("option:selected").attr("serviceId")); });