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

(1)共用页面位置移动

Browse Source 
(2)IP限流，域名限流提交
(3)页面部分权限bug修复
(4)部分菜单国际化代码提交
This commit is contained in:
wangxin
2018-06-23 15:34:21 +08:00
parent 3206972ee9
commit d630f20b17
10 changed files with 177 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
View File

@@ -41,15 +41,15 @@ public class ControlController extends CommonController {
this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/control");
model.addAttribute("requiresPermissionPrefix","control:ip");
return "/cfg/proxy/ipList";
return "/cfg/common/ipList";
}
@RequestMapping(value = {"/domain/list"})
@RequiresPermissions(value={"control:ip:config","control:ip:audit"},logical=Logical.OR)
@RequiresPermissions(value={"control:domain:config","control:domain:audit"},logical=Logical.OR)
public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._domainList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/control");
model.addAttribute("requiresPermissionPrefix","control:domain");
return "/cfg/proxy/domainList";
return "/cfg/common/domainList";
}
@RequestMapping(value = {"/ip/form"})
@RequiresPermissions(value={"control:ip:config"})
@@ -57,15 +57,15 @@ public class ControlController extends CommonController {
this._ipForm(cfgName,model, ids, functionId, entity);
model.addAttribute("urlPrefix","/proxy/control");
model.addAttribute("requiresPermissionPrefix","control:ip");
return "/cfg/proxy/ipForm";
return "/cfg/common/ipForm";
}
@RequestMapping(value = {"/domain/form"})
@RequiresPermissions(value={"intercept:domain:config"})
@RequiresPermissions(value={"control:domain:config"})
public String domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) {
this._domainForm(cfgName, model, ids, functionId, entity);
model.addAttribute("urlPrefix","/proxy/control");
model.addAttribute("requiresPermissionPrefix","control:domain");
return "/cfg/proxy/domainForm";
return "/cfg/common/domainForm";
}
@RequestMapping(value = {"/ip/saveOrUpdate"})
public String saveOrUpdateIp(String cfgName,RedirectAttributes model, IpPortCfg cfg) {
@@ -91,7 +91,7 @@ public class ControlController extends CommonController {
this._deleteDomain(cfgName, ids, compileIds, functionId, model);
model.addAttribute("urlPrefix","/proxy/control");
model.addAttribute("requiresPermissionPrefix","control:domain");
return "redirect:" + adminPath +"/proxy/config/domain/list?functionId="+functionId;
return "redirect:" + adminPath +"/proxy/control/domain/list?functionId="+functionId;
}
@RequestMapping(value = {"/ip/audit"})
// @RequiresPermissions("control:ip:audit")

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

@@ -31,7 +31,7 @@ public class InterceptController extends CommonController{
this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/intercept");
model.addAttribute("requiresPermissionPrefix","intercept:ip");
return "/cfg/proxy/ipList";
return "/cfg/common/ipList";
}
@RequestMapping(value = {"/domain/list"})
@RequiresPermissions(value={"intercept:domain:config","intercept:domain:audit"},logical=Logical.OR)
@@ -39,7 +39,7 @@ public class InterceptController extends CommonController{
this._domainList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/intercept");
model.addAttribute("requiresPermissionPrefix","intercept:domain");
return "/cfg/proxy/domainList";
return "/cfg/common/domainList";
}
@RequestMapping(value = {"/ip/form"})
@RequiresPermissions(value={"intercept:ip:config"})
@@ -47,7 +47,7 @@ public class InterceptController extends CommonController{
this._ipForm(cfgName,model, ids, functionId, entity);
model.addAttribute("urlPrefix","/proxy/intercept");
model.addAttribute("requiresPermissionPrefix","intercept:ip");
return "/cfg/proxy/ipForm";
return "/cfg/common/ipForm";
}
@RequestMapping(value = {"/domain/form"})
@RequiresPermissions(value={"intercept:domain:config"})
@@ -55,7 +55,7 @@ public class InterceptController extends CommonController{
this._domainForm(cfgName, model, ids, functionId, entity);
model.addAttribute("urlPrefix","/proxy/intercept");
model.addAttribute("requiresPermissionPrefix","intercept:domain");
return "/cfg/proxy/domainForm";
return "/cfg/common/domainForm";
}
@RequestMapping(value = {"/ip/saveOrUpdate"})
public String saveOrUpdateIp(String cfgName,RedirectAttributes model, IpPortCfg cfg) {