(1)注释掉IP与域名后台列表方法的权限注解
(2)IP,域名通用页面加入隐藏的查询条件,来函,分类,性质标签 (3)分类的国际化代码改为classification
This commit is contained in:
@@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.ntc;
|
||||
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;
|
||||
@@ -27,7 +26,7 @@ import com.nis.web.controller.configuration.CommonController;
|
||||
@RequestMapping("${adminPath}/ntc/iplist")
|
||||
public class IpController extends CommonController{
|
||||
@RequestMapping(value = {"list"})
|
||||
@RequiresPermissions(value={"iplist:config","iplist:confirm"},logical=Logical.OR)
|
||||
// @RequiresPermissions(value={"iplist:config","iplist:confirm"},logical=Logical.OR)
|
||||
public String list(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
|
||||
this._ipList(cfgName, model, cfg, request, response);
|
||||
model.addAttribute("urlPrefix","/ntc/iplist");
|
||||
|
||||
@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.Logical;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
@@ -37,7 +36,7 @@ import com.nis.web.controller.configuration.CommonController;
|
||||
public class WhiteListController extends CommonController{
|
||||
|
||||
@RequestMapping(value = {"ip/list"})
|
||||
@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm"},logical=Logical.OR)
|
||||
//@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm","whitelist:ip:aduit"},logical=Logical.OR)
|
||||
public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
|
||||
cfg.setTableName(IpPortCfg.getTablename());
|
||||
Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r");
|
||||
@@ -47,7 +46,7 @@ public class WhiteListController extends CommonController{
|
||||
return "/cfg/whitelist/ipList";
|
||||
}
|
||||
@RequestMapping(value = {"domain/list"})
|
||||
@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm"},logical=Logical.OR)
|
||||
//@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm","whitelist:domain:aduit"},logical=Logical.OR)
|
||||
public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
|
||||
cfg.setTableName(HttpUrlCfg.getTablename());
|
||||
Page<HttpUrlCfg> searchPage=new Page<HttpUrlCfg>(request,response,"r");
|
||||
|
||||
Reference in New Issue
Block a user