gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复BUG：

Browse Source 
1.修复DDOS配置流量阈值(Bps)/(Pps)默认值Bug
2.修正配置导入域名字段错误提示信息
3.SNAT/DNAT复用策略配置 暂不支持 跳转日志检索
4.缓存策略配置导出忽略doLog（与界面列表一致）
5.修复音视频样例配置上传文件二次选择取消后文件框中的文件名还存在
6.修复特定服务管理新增报错
This commit is contained in:
zhangwenqing
2019-01-27 22:42:14 +08:00
parent affdaf513a
commit 11424ee91d
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -469,8 +469,12 @@ public class CheckStringFormatThread implements Callable<String>{
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")) + ";");
}
}
}

2
src/main/java/com/nis/util/excel/thread/CheckTopicWebsiteFormatThread.java
View File

@@ -287,7 +287,7 @@ public class CheckTopicWebsiteFormatThread implements Callable<String>{
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")) + ";");
}
}
}

2
src/main/java/com/nis/web/controller/configuration/proxy/CachePolicyController.java
View File

@@ -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"

4
src/main/java/com/nis/web/service/configuration/DdosCfgService.java
View File

@@ -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){

1
src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java
View File

@@ -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);

2
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -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"){

14
src/main/webapp/static/global/scripts/pzLog.js
View File

@@ -172,11 +172,19 @@ var GetLogTotal=function(_data){
var hasLog=false;
for(var i=0;i<data.length;i++){
if($(this).attr("compileId")==data[i].compileId){
var serviceId= $(this).attr("serviceId");
var serviceId= $(this).attr("serviceId");
var functionId= $(this).attr("functionId");
$(this).attr("id",i+"logTotal");
//$(this).html(data[i].sum);
$(this).html("<a href='javascript:;' onclick='logSearch(\""+data[i].compileId+"\",\""+serviceId+"\")'>"+data[i].sum+"<a>");
$(this).parent("tr").find("td:eq(1)").html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].compileId+"<a>");
// SNAT/DNAT复用策略配置 暂不支持 跳转日志检索
if($(this).attr("functionId") != 300 && $(this).attr("functionId") != 304){
$(this).html("<a href='javascript:;' onclick='logSearch(\""+data[i].compileId+"\",\""+serviceId+"\")'>"+data[i].sum+"<a>");
$(this).parent("tr").find("td:eq(1)").html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].compileId+"<a>");
}else{
$(this).html(data[i].sum);
$(this).parent("tr").find("td:eq(1)").html(data[i].compileId);
}
hasLog=true;
}
}