(1)注释掉IP与域名后台列表方法的权限注解

(2)IP,域名通用页面加入隐藏的查询条件,来函,分类,性质标签
(3)分类的国际化代码改为classification
This commit is contained in:
wangxin
2018-07-13 14:15:38 +08:00
parent 317d0ff9d7
commit 4d6d89452a
9 changed files with 136 additions and 19 deletions

View File

@@ -11,7 +11,6 @@ package com.nis.web.controller.configuration.proxy;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -38,7 +37,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/proxy/control")
public class ControlController extends CommonController {
@RequestMapping(value = {"/ip/list"})
@RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR)
// @RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR)
public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/control/ip");
@@ -46,7 +45,7 @@ public class ControlController extends CommonController {
return "/cfg/common/ipList";
}
@RequestMapping(value = {"/domain/list"})
@RequiresPermissions(value={"control:domain:config","control:domain:confirm"},logical=Logical.OR)
// @RequiresPermissions(value={"control:domain:config","control:domain:confirm"},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/domain");

View File

@@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.proxy;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -28,7 +27,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/proxy/intercept")
public class InterceptController extends CommonController{
@RequestMapping(value = {"/ip/list"})
@RequiresPermissions(value={"intercept:ip:config","intercept:ip:confirm"},logical=Logical.OR)
// @RequiresPermissions(value={"intercept:ip:config","intercept:ip:confirm"},logical=Logical.OR)
public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/intercept/ip");
@@ -36,7 +35,7 @@ public class InterceptController extends CommonController{
return "/cfg/common/ipList";
}
@RequestMapping(value = {"/domain/list"})
@RequiresPermissions(value={"intercept:domain:config","intercept:domain:confirm"},logical=Logical.OR)
// @RequiresPermissions(value={"intercept:domain:config","intercept:domain:confirm"},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/intercept/domain");