From b307bffb26a05e30f1916288c86dc53b77f2fe17 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Sun, 27 Jan 2019 14:42:14 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG=EF=BC=9A=201.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DDDOS=E9=85=8D=E7=BD=AE=E6=B5=81=E9=87=8F=E9=98=88?= =?UTF-8?q?=E5=80=BC(Bps)/(Pps)=E9=BB=98=E8=AE=A4=E5=80=BCBug=202.?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=203.SNAT/DNAT=E5=A4=8D=E7=94=A8=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E9=85=8D=E7=BD=AE=20=E6=9A=82=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20=E8=B7=B3=E8=BD=AC=E6=97=A5=E5=BF=97=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=204.=E7=BC=93=E5=AD=98=E7=AD=96=E7=95=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=AF=BC=E5=87=BA=E5=BF=BD=E7=95=A5doLog=EF=BC=88?= =?UTF-8?q?=E4=B8=8E=E7=95=8C=E9=9D=A2=E5=88=97=E8=A1=A8=E4=B8=80=E8=87=B4?= =?UTF-8?q?=EF=BC=89=205.=E4=BF=AE=E5=A4=8D=E9=9F=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=A0=B7=E4=BE=8B=E9=85=8D=E7=BD=AE=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BA=8C=E6=AC=A1=E9=80=89=E6=8B=A9=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=90=8E=E6=96=87=E4=BB=B6=E6=A1=86=E4=B8=AD=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E8=BF=98=E5=AD=98=E5=9C=A8=206.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 11424ee91db838e0db2f3141cf1449ed24037578) --- .../util/excel/thread/CheckStringFormatThread.java | 6 +++++- .../thread/CheckTopicWebsiteFormatThread.java | 2 +- .../configuration/proxy/CachePolicyController.java | 2 +- .../web/service/configuration/DdosCfgService.java | 4 ++-- .../specific/SpecificServiceCfgService.java | 1 + .../webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp | 2 +- src/main/webapp/static/global/scripts/pzLog.js | 14 +++++++++++--- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java index 846f8dfb7..be14df6f4 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -469,8 +469,12 @@ public class CheckStringFormatThread implements Callable{ if (hexP.indexOf("1") != -1 && isHex.intValue() == 1) { boolean bl = Pattern.compile("^([0-9|a-f|A-F]*)$").matcher(keyword).matches(); if(!bl) { + String message = prop.getProperty("key_word"); + if(regionDict.getFunctionId().equals(403) || regionDict.getFunctionId().equals(200)) { + message = prop.getProperty("domain_name"); + } errInfo.append( - prop.getProperty("key_word") + " '" + keyword + "' "+String.format(prop.getProperty("contains_non_hex_char")) + ";"); + message + " '" + keyword + "' "+String.format(prop.getProperty("contains_non_hex_char")) + ";"); } } } diff --git a/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java index dd59f0194..2be1b7641 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java @@ -287,7 +287,7 @@ public class CheckTopicWebsiteFormatThread implements Callable{ boolean bl = Pattern.compile("^([0-9|a-f|A-F]*)$").matcher(keyword).matches(); if(!bl) { errInfo.append( - prop.getProperty("key_word") + " '" + keyword + "' "+String.format(prop.getProperty("contains_non_hex_char")) + ";"); + prop.getProperty("domain_name") + " '" + keyword + "' "+String.format(prop.getProperty("contains_non_hex_char")) + ";"); } } } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java index 44206d84c..87996d638 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java @@ -256,7 +256,7 @@ public class CachePolicyController extends BaseController{ classMap.put(entity.getMenuNameCode(), CachePolicyUserRegion.class); classMap.put("PXY_CACHE_HTTP_URL", HttpUrlCfg.class); classMap.put("PXY_CACHE_HTTP_COOKIE", HttpUrlCfg.class); - String cfgIndexInfoNoExport=",block_type,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-"; + String cfgIndexInfoNoExport=",block_type,do_log,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-"; String httpUrlInfoNoExport=",block_type,do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + ",config_time,editor,edit_time,auditor,audit_time" +",letter,whether_area_block,classification,attribute,label" diff --git a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java index d5945afe8..20e1f0736 100644 --- a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java @@ -81,13 +81,13 @@ public class DdosCfgService extends BaseService{ if(StringUtil.isBlank(antiddosProtocol)) { entity.setAntiddosProtocol(""); entity.setBpsThreadshold(0l); - entity.setBpsThreadshold(0l); + entity.setPpsThreadshold(0l); } if(bpsThreadshold==null) { entity.setBpsThreadshold(0l); } if(ppsThreadshold==null) { - entity.setBpsThreadshold(0l); + entity.setPpsThreadshold(0l); } //新增 if(entity.getCfgId()==null){ diff --git a/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java index 04db8b94a..eeeca314e 100644 --- a/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java +++ b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java @@ -92,6 +92,7 @@ public class SpecificServiceCfgService extends BaseService{ group.setGroupName(specificServiceCfg.getSpecServiceName()); group.setIsIssued(0); group.setGroupType(1); + group.setInsertTime(new Date()); if(specificServiceCfg.getCfgType()==1) { Integer compileId = ConfigServiceUtil.getId(1, 1).get(0); group.setCompileId(compileId); diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index d1e23bdc7..9355d1f2f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -47,9 +47,9 @@ $(function(){ }); $("#srcFile").on('change',function(){ + $("#srcFileInfo").val($("#srcFile").val()); if(sfd!=631&&sfd!=632&&sampleFileValidate(fileType,$("#srcFile").val())){ //样例文件类型正确进行后续处理 - $("#srcFileInfo").val($("#srcFile").val()); var videoToPicture = $("#videoToPicture").val(); if(videoToPicture=="true"){ diff --git a/src/main/webapp/static/global/scripts/pzLog.js b/src/main/webapp/static/global/scripts/pzLog.js index 6b731fa78..dc84db96e 100644 --- a/src/main/webapp/static/global/scripts/pzLog.js +++ b/src/main/webapp/static/global/scripts/pzLog.js @@ -172,11 +172,19 @@ var GetLogTotal=function(_data){ var hasLog=false; for(var i=0;i"+data[i].sum+""); - $(this).parent("tr").find("td:eq(1)").html(""+data[i].compileId+""); + // SNAT/DNAT复用策略配置 暂不支持 跳转日志检索 + if($(this).attr("functionId") != 300 && $(this).attr("functionId") != 304){ + $(this).html(""+data[i].sum+""); + $(this).parent("tr").find("td:eq(1)").html(""+data[i].compileId+""); + }else{ + $(this).html(data[i].sum); + $(this).parent("tr").find("td:eq(1)").html(data[i].compileId); + } hasLog=true; } }