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; } }