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

1、配置列表增加日志总数一列；2、相关业务配置审核时处理用户自定义域信息；3、APP类配置增加behavCode字段,appCode字段由字符串改为Integer

Browse Source 
Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-28 17:16:58 +08:00
parent 09ed1bb293
commit 321ebbe472
30 changed files with 285 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -92,7 +92,7 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/policyCfgList?function="+entity.getFunctionId();
return "redirect:" + adminPath +"/app/policyCfgList?functionId="+entity.getFunctionId();
}
/**
* 策略配置审核
@@ -198,7 +198,7 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/ipCfgList?function="+entity.getFunctionId();
return "redirect:" + adminPath +"/app/ipCfgList?functionId="+entity.getFunctionId();
}
/**
* 协议IP配置审核
@@ -259,7 +259,7 @@ public class AppCfgController extends BaseController {
for(AppHttpCfg entity:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
entity.setAppName(app.getSpecServiceName());
entity.setCfgKeywords(entity.getCfgKeywords().replace(Constants.KEYWORD_EXPR, "&"));
// entity.setCfgKeywords(entity.getCfgKeywords().replace(Constants.KEYWORD_EXPR, "&"));
}
model.addAttribute("page", page);
initPageCondition(model,cfg);
@@ -304,7 +304,7 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/httpCfgList?function="+entity.getFunctionId();
return "redirect:" + adminPath +"/app/httpCfgList?functionId="+entity.getFunctionId();
}
/**
* http配置审核
@@ -409,7 +409,7 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/domainCfgList?function="+entity.getFunctionId();
return "redirect:" + adminPath +"/app/domainCfgList?functionId="+entity.getFunctionId();
}
/**
* domain配置审核
@@ -514,7 +514,7 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/byteCfgList?function="+entity.getFunctionId();
return "redirect:" + adminPath +"/app/byteCfgList?functionId="+entity.getFunctionId();
}
/**
* byte配置审核