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

多域的日志增加可查看配置详情，隐藏日志中的查看详情，提供可以复制日志过长title功能

Browse Source
This commit is contained in:
zhanghongqing
2018-11-28 19:23:38 +08:00
parent 7ab1a38131
commit 1fbc899269
75 changed files with 869 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -70,7 +70,7 @@ public class HttpRedirectPolicyController extends BaseController{
,logical=Logical.OR)
public String form(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo entity){
if(StringUtils.isNotBlank(ids)){
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(ids));
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(ids),entity.getCompileId());
HttpUrlCfg urlCfg = new HttpUrlCfg();
urlCfg.setCfgType(Constants.HTTP_REDIRECT_URL_REGION);
@@ -199,8 +199,8 @@ public class HttpRedirectPolicyController extends BaseController{
return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"ajaxHttpSubList"})
public String ajaxHttpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = httpRedirectCfgService.getHttpCfg(cfgId);
public String ajaxHttpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = httpRedirectCfgService.getHttpCfg(cfgId,compileId);
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
return "/cfg/proxy/control/httpRedirectSubList";
@@ -227,7 +227,7 @@ public class HttpRedirectPolicyController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(id));
entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());

8
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -63,7 +63,7 @@ public class InterceptController extends CommonController{
@RequestMapping(value = {"/interceptIpForm","interceptDomainForm","interceptIpPayloadForm"})
public String interceptIpForm(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){
entity = interceptCfgService.getInterceptCfg(Long.parseLong(ids));
entity = interceptCfgService.getInterceptCfg(Long.parseLong(ids),null);
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -98,8 +98,8 @@ public class InterceptController extends CommonController{
}
@RequestMapping(value = {"/ajaxInterceptIpSubList","/ajaxInterceptDomainSubList","/ajaxInterceptIpPayloadSubList"})
public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index) {
CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId);
public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -139,7 +139,7 @@ public class InterceptController extends CommonController{
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = interceptCfgService.getInterceptCfg(Long.parseLong(id));
entity = interceptCfgService.getInterceptCfg(Long.parseLong(id),null);
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());