diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 94254a84d..c5428af83 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -138,7 +138,7 @@ public class AppCfgController extends BaseController { * @return */ @RequestMapping(value = {"auditAppPolicyCfg"}) - @RequiresPermissions(value={"app:policy:audit"}) + @RequiresPermissions(value={"app:policy:confirm"}) public String auditAppPolicyCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { AppPolicyCfg entity = new AppPolicyCfg(); String[] idArray = ids.split(","); @@ -248,7 +248,7 @@ public class AppCfgController extends BaseController { * @return */ @RequestMapping(value = {"auditAppIpCfg"}) - @RequiresPermissions(value={"app:ip:audit"}) + @RequiresPermissions(value={"app:ip:confirm"}) public String auditAppIpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { AppIpCfg entity = new AppIpCfg(); String[] idArray = ids.split(","); @@ -358,7 +358,7 @@ public class AppCfgController extends BaseController { * @return */ @RequestMapping(value = {"auditAppHttpCfg"}) -// @RequiresPermissions(value={"app:http:audit"}) +// @RequiresPermissions(value={"app:http:confirm"}) public String auditAppHttpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { AppHttpCfg entity = new AppHttpCfg(); String[] idArray = ids.split(","); @@ -467,7 +467,7 @@ public class AppCfgController extends BaseController { * @return */ @RequestMapping(value = {"auditAppDomainCfg"}) -// @RequiresPermissions(value={"app:domain:audit"}) +// @RequiresPermissions(value={"app:domain:confirm"}) public String auditAppDomainCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { AppDomainCfg entity = new AppDomainCfg(); String[] idArray = ids.split(","); @@ -576,7 +576,7 @@ public class AppCfgController extends BaseController { * @return */ @RequestMapping(value = {"auditAppByteCfg"}) -// @RequiresPermissions(value={"app:byte:audit"}) +// @RequiresPermissions(value={"app:byte:confirm"}) public String auditAppByteCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { AppByteCfg entity = new AppByteCfg(); String[] idArray = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index ae999cfd4..b57802e5d 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -85,7 +85,7 @@ public class DnsIpCfgController extends BaseController { return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId; } @RequestMapping(value = {"/audit"}) - @RequiresPermissions(value={"dns:fake:ip:audit"}) + @RequiresPermissions(value={"dns:fake:ip:confirm"}) public String audit(Integer isAudit,Integer isValid,String ids ,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index 1d697f12d..9b8beaed3 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -107,7 +107,7 @@ public class DnsResStrategyController extends BaseController { } @RequestMapping(value = {"/audit"}) - @RequiresPermissions(value={"dns:res:strategy:audit"}) + @RequiresPermissions(value={"dns:res:strategy:confirm"}) public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index 30bfd4288..4a20956ed 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java @@ -97,7 +97,7 @@ public class IpMultiplexPoolCfgController extends BaseController { } @RequestMapping(value = {"/audit"}) - @RequiresPermissions(value={"ip:mulitiplex:pool:audit"}) + @RequiresPermissions(value={"ip:mulitiplex:pool:confirm"}) public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index b8dfa57e5..2437f7b38 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -73,7 +73,7 @@ public class DdosCfgController extends BaseController { return "redirect:" + adminPath +"/manipulation/ddos/list?functionId="+functionId; } @RequestMapping(value = {"/audit"}) - //@RequiresPermissions(value={"ddos:ip:audit"}) + //@RequiresPermissions(value={"ddos:ip:confirm"}) public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index 3bf354dd2..9b3ef0740 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -42,7 +42,7 @@ import com.nis.web.controller.configuration.CommonController; @RequestMapping("${adminPath}/manipulation/ipmulitiplex") public class IpMultiplexController extends CommonController { @RequestMapping(value = {"/list"}) - @RequiresPermissions(value={"ip:mulitiplex:config","ip:mulitiplex:audit"},logical=Logical.OR) + @RequiresPermissions(value={"ip:mulitiplex:config","ip:mulitiplex: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","/manipulation/ipmulitiplex"); @@ -83,7 +83,7 @@ public class IpMultiplexController extends CommonController { return "redirect:" + adminPath +"/manipulation/ipmulitiplex/list?functionId="+functionId; } @RequestMapping(value = {"/audit"}) - @RequiresPermissions("ip:mulitiplex:audit") + @RequiresPermissions("ip:mulitiplex:confirm") public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName,ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java index 157811b5c..cb1b9058a 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java @@ -38,7 +38,7 @@ import com.nis.web.controller.configuration.CommonController; @RequestMapping("${adminPath}/manipulation/ratelimit") public class RatelimitController extends CommonController { @RequestMapping(value = {"/ip/list"}) - @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:audit"},logical=Logical.OR) + @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit: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","/manipulation/ratelimit/ip"); @@ -46,7 +46,7 @@ public class RatelimitController extends CommonController { return "/cfg/common/ipList"; } @RequestMapping(value = {"/domain/list"}) - @RequiresPermissions(value={"domain:ratelimit:config","domain:ratelimit:audit"},logical=Logical.OR) + @RequiresPermissions(value={"domain:ratelimit:config","domain:ratelimit: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","/manipulation/ratelimit/domain"); @@ -96,7 +96,7 @@ public class RatelimitController extends CommonController { return "redirect:" + adminPath +"/manipulation/ratelimit/domain/list?functionId="+functionId; } @RequestMapping(value = {"/ip/audit"}) - @RequiresPermissions("ip:ratelimit:audit") + @RequiresPermissions("ip:ratelimit:confirm") public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName,ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit/ip"); @@ -104,7 +104,7 @@ public class RatelimitController extends CommonController { return "redirect:" + adminPath +"/manipulation/ratelimit/ip/list?functionId="+cfg.getFunctionId(); } @RequestMapping(value = {"/domain/audit"}) - @RequiresPermissions("domain:ratelimit:audit") + @RequiresPermissions("domain:ratelimit:confirm") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { this._auditDomain(ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index 6d2f2e269..12d512e46 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -127,7 +127,7 @@ public class AvContentController extends BaseController { } //修改VOIP配置审核状态 @RequestMapping(value = {"/auditAvVoip"}) - @RequiresPermissions(value={"avVoip:audit"}) + @RequiresPermissions(value={"avVoip:confirm"}) public String auditVoip(Integer isAudit,Integer isValid,String ids ,String compileIds,Integer functionId ,RedirectAttributes redirectAttributes) { @@ -226,7 +226,7 @@ public class AvContentController extends BaseController { } //修改CONTIP配置审核 @RequestMapping(value = {"/auditAvContIp"}) - @RequiresPermissions(value={"avContIp:audit"}) + @RequiresPermissions(value={"avContIp:confirm"}) public String auditContIp(Integer isAudit,Integer isValid ,String ids,String compileIds,Integer functionId , RedirectAttributes redirectAttributes) { @@ -308,7 +308,7 @@ public class AvContentController extends BaseController { } //修改CONTIP配置审核 @RequestMapping(value = {"/auditPicIp"}) - @RequiresPermissions(value={"avPicIp:audit"}) + @RequiresPermissions(value={"avPicIp:confirm"}) public String auditPicIp(Integer isAudit,Integer isValid,String ids ,String compileIds,Integer functionId , RedirectAttributes redirectAttributes) { @@ -390,7 +390,7 @@ public class AvContentController extends BaseController { } //修改CONTUrl配置审核 @RequestMapping(value = {"/auditAvContUrl"}) - @RequiresPermissions(value={"avContUrl:audit"}) + @RequiresPermissions(value={"avContUrl:confirm"}) public String auditContUrl(Integer isAudit,Integer isValid,String ids ,String compileIds,Integer functionId , RedirectAttributes redirectAttributes) { @@ -472,7 +472,7 @@ public class AvContentController extends BaseController { } //修改CONTUrl配置审核 @RequestMapping(value = {"/auditAvPicUrl"}) - @RequiresPermissions(value={"avPicUrl:audit"}) + @RequiresPermissions(value={"avPicUrl:confirm"}) public String auditPicUrl(Integer isAudit,Integer isValid ,String ids,String compileIds,Integer functionId , RedirectAttributes redirectAttributes) { diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index 827144acc..fdac8deab 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -106,7 +106,7 @@ public class BgpCfgController extends BaseController{ } @RequestMapping(value = {"auditBgpCfg"}) - @RequiresPermissions(value={"other:bgp:audit"}) + @RequiresPermissions(value={"other:bgp:confirm"}) public String auditBgpCfg(Integer isAudit,Integer isValid,String ids ,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 5c2e21554..649dd4730 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -108,7 +108,7 @@ public class FileTransferCfgController extends BaseController{ return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId; } @RequestMapping(value = {"auditFtpCfg"}) - @RequiresPermissions(value={"fileTransfer:ftp:audit"}) + @RequiresPermissions(value={"fileTransfer:ftp:confirm"}) public String auditFtpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); @@ -208,7 +208,7 @@ public class FileTransferCfgController extends BaseController{ } @RequestMapping(value = {"auditFileDigestCfg"}) - @RequiresPermissions(value={"fileTransfer:fileDigest:audit"}) + @RequiresPermissions(value={"fileTransfer:fileDigest:confirm"}) public String auditFileDigestCfg(Integer isAudit,Integer isValid ,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 65dc92ae0..685260052 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -27,7 +27,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:audit"},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"); @@ -56,7 +56,7 @@ public class IpController extends CommonController{ return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+functionId; } @RequestMapping(value = {"audit"}) - @RequiresPermissions("iplist:audit") + @RequiresPermissions("iplist:confirm") public String audit(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName, ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/ntc/iplist"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index 75e35434a..c08b5d2e3 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java @@ -143,7 +143,7 @@ public class MailCfgController extends BaseController{ return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+functionId; } @RequestMapping(value = {"auditMailCfg"}) - @RequiresPermissions(value={"mail:audit"}) + @RequiresPermissions(value={"mail:confirm"}) public String auditMailCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index 670e9c05b..353b70ff6 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -185,7 +185,7 @@ public class WebsiteController extends BaseController{ return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+functionId; } @RequestMapping(value = {"auditHttpCfg"}) - @RequiresPermissions(value={"website:http:audit"}) + @RequiresPermissions(value={"website:http:confirm"}) public String auditHttpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); @@ -269,7 +269,7 @@ public class WebsiteController extends BaseController{ return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId; } @RequestMapping(value = {"auditSslCfg"}) - @RequiresPermissions(value={"website:ssl:audit"}) + @RequiresPermissions(value={"website:ssl:confirm"}) public String auditSslCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); @@ -346,7 +346,7 @@ public class WebsiteController extends BaseController{ return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+functionId; } @RequestMapping(value = {"auditDnsCfg"}) - @RequiresPermissions(value={"website:dns:audit"}) + @RequiresPermissions(value={"website:dns:confirm"}) public String auditDnsCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index 6bf85fdf8..1f0a4a8c1 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -37,7 +37,7 @@ import com.nis.web.controller.configuration.CommonController; public class WhiteListController extends CommonController{ @RequestMapping(value = {"ip/list"}) - @RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:audit"},logical=Logical.OR) + @RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm"},logical=Logical.OR) public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { cfg.setTableName(IpPortCfg.getTablename()); Page searchPage=new Page(request,response,"r"); @@ -47,7 +47,7 @@ public class WhiteListController extends CommonController{ return "/cfg/whitelist/ipList"; } @RequestMapping(value = {"domain/list"}) - @RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:audit"},logical=Logical.OR) + @RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm"},logical=Logical.OR) public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { cfg.setTableName(HttpUrlCfg.getTablename()); Page searchPage=new Page(request,response,"r"); @@ -167,7 +167,7 @@ public class WhiteListController extends CommonController{ return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId; } @RequestMapping(value = {"ip/audit"}) - @RequiresPermissions("whitelist:ip:audit") + @RequiresPermissions("whitelist:ip:confirm") public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { try{ for(String id:ids.split(",")){ @@ -194,7 +194,7 @@ public class WhiteListController extends CommonController{ return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId(); } @RequestMapping(value = {"domain/audit"}) - @RequiresPermissions("whitelist:domain:audit") + @RequiresPermissions("whitelist:domain:confirm") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { try{ List beans=domainService.getListByCfgId(ids); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java b/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java index 8b48d681a..428cdebf4 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java @@ -42,7 +42,7 @@ import com.nis.web.security.UserUtils; @RequestMapping("${adminPath}/ntc/other") public class XmppController extends BaseController { @RequestMapping(value = {"xmppList"}) - @RequiresPermissions(value={"other:xmpp:config","other:xmpp:audit"},logical=Logical.OR) + @RequiresPermissions(value={"other:xmpp:config","other:xmpp:confirm"},logical=Logical.OR) public String list(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"a"); Page page = xmppCfgService.getXmppList(searchPage, cfg); @@ -70,7 +70,7 @@ public class XmppController extends BaseController { return "redirect:" + adminPath +"/ntc/other/xmppList?functionId="+functionId; } @RequestMapping(value = {"auditXmppCfg"}) - @RequiresPermissions(value={"other:xmpp:audit"}) + @RequiresPermissions(value={"other:xmpp:confirm"}) public String auditXmppCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java index cbeb32e54..c122adaf0 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java @@ -38,7 +38,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:audit"},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 +46,7 @@ public class ControlController extends CommonController { return "/cfg/common/ipList"; } @RequestMapping(value = {"/domain/list"}) - @RequiresPermissions(value={"control:domain:config","control:domain:audit"},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"); @@ -96,7 +96,7 @@ public class ControlController extends CommonController { return "redirect:" + adminPath +"/proxy/control/domain/list?functionId="+functionId; } @RequestMapping(value = {"/ip/audit"}) - @RequiresPermissions("control:ip:audit") + @RequiresPermissions("control:ip:confirm") public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName,ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/proxy/control/ip"); @@ -104,7 +104,7 @@ public class ControlController extends CommonController { return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+cfg.getFunctionId(); } @RequestMapping(value = {"/domain/audit"}) - @RequiresPermissions("control:domain:audit") + @RequiresPermissions("control:domain:confirm") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { this._auditDomain(ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/proxy/control/domain"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 3fd5505bb..ae0a71ad5 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -158,7 +158,7 @@ public class HttpRedirectPolicyController extends BaseController{ return "redirect:" + adminPath +"/proxy/control/httpRedirect/list?functionId="+functionId; } @RequestMapping(value = {"audit"}) - @RequiresPermissions(value={"control:httpRedirect:audit"}) + @RequiresPermissions(value={"control:httpRedirect:confirm"}) public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 1e58b6a28..f860560f9 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -28,7 +28,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:audit"},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 +36,7 @@ public class InterceptController extends CommonController{ return "/cfg/common/ipList"; } @RequestMapping(value = {"/domain/list"}) - @RequiresPermissions(value={"intercept:domain:config","intercept:domain:audit"},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"); @@ -86,7 +86,7 @@ public class InterceptController extends CommonController{ return "redirect:" + adminPath +"/proxy/intercept/domain/list?functionId="+functionId; } @RequestMapping(value = {"/ip/audit"}) - @RequiresPermissions("intercept:ip:audit") + @RequiresPermissions("intercept:ip:confirm") public String auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { this._auditIp(cfgName,ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/proxy/intercept/ip"); @@ -94,7 +94,7 @@ public class InterceptController extends CommonController{ return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId(); } @RequestMapping(value = {"/domain/audit"}) - @RequiresPermissions("intercept:domain:audit") + @RequiresPermissions("intercept:domain:confirm") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { this._auditDomain(ids, cfg, redirectAttributes); redirectAttributes.addAttribute("urlPrefix","/proxy/intercept/domain"); diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index 98cb29158..6cde7360c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -115,7 +115,7 @@ - +
- <%-- + <%-- --> - +
--> - +
--> - +
--> - +