将审核权限的:audit改为:confirm

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(",");

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)){

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)){

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(",");

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(",");

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");

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");

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) {

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();

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)){

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");

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(",");

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(",");

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<BaseIpCfg> searchPage=new Page<BaseIpCfg>(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<HttpUrlCfg> searchPage=new Page<HttpUrlCfg>(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<HttpUrlCfg> beans=domainService.getListByCfgId(ids);

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<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
 		Page<CfgIndexInfo> 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(",");

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");

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(",");

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");

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp

@@ -115,7 +115,7 @@
 							 			<sys:delRow url="${ctx}/app/byteCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppByteCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="app:byte:audit">
+                               		<shiro:hasPermission name="app:byte:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -115,7 +115,7 @@
 							 			<sys:delRow url="${ctx}/app/domainCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppDomainCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="app:domain:audit">
+                               		<shiro:hasPermission name="app:domain:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -115,7 +115,7 @@
 							 			<sys:delRow url="${ctx}/app/httpCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="app:http:audit">
+                               		<shiro:hasPermission name="app:http:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -119,7 +119,7 @@
 							 			<sys:delRow url="${ctx}/app/ipCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppIpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="app:ip:audit">
+                               		<shiro:hasPermission name="app:ip:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -157,7 +157,7 @@
 							 			<sys:delRow url="${ctx}/app/policyCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppPolicyCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="app:policy:audit">
+                               		<shiro:hasPermission name="app:policy:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp

@@ -153,7 +153,7 @@
 							      		</shiro:hasPermission>
 									</c:if>
 									<c:if test="${audit==1}">
-										<shiro:hasPermission name="cfg:audit">
+										<shiro:hasPermission name="cfg:confirm">
 											<div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -166,7 +166,7 @@
 	                                            </ul>
 	                                        </div>		
                                         </shiro:hasPermission>				        		
-						        		<%-- <shiro:hasPermission name="cfg:audit">
+						        		<%-- <shiro:hasPermission name="cfg:confirm">
 						        			<button type="button" class="btn btn-default" onclick="auditCfg(1)">
                                             <i class="fa fa-check"></i> <spring:message code="approved"/> </button>
                                             <button type="button" class="btn btn-default" onclick="auditCfg(2)">
@@ -461,15 +461,15 @@
 									      <c:if test="${audit==1}">
 									      	<c:choose>
 									        	<c:when test="${cfg.isAudit eq '1'}">
-									        		<shiro:hasPermission name="cfg:audit">
+									        		<shiro:hasPermission name="cfg:confirm">
 											        <li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&ids=${cfg.cfgId}&auditState=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
 											        </shiro:hasPermission>
 									        	</c:when>
 									        	<c:when test="${cfg.isAudit eq '0'}">
-									        		<shiro:hasPermission name="cfg:audit">
+									        		<shiro:hasPermission name="cfg:confirm">
 									        		<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&ids=${cfg.cfgId}&auditState=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        		</shiro:hasPermission>
-									        		<shiro:hasPermission name="cfg:audit">
+									        		<shiro:hasPermission name="cfg:confirm">
 									        		<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&ids=${cfg.cfgId}&auditState=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
 									        		</shiro:hasPermission>
 									        	</c:when>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -122,7 +122,7 @@
 							 			<sys:delRow url="${ctx}/ntc/av/contIpForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvContIpValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="avContIp:audit">
+                               		<shiro:hasPermission name="avContIp:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -119,7 +119,7 @@
 							 			<sys:delRow url="${ctx}/ntc/av/contUrlForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvContUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="avContUrl:audit">
+                               		<shiro:hasPermission name="avContUrl:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -117,7 +117,7 @@
 							 			<sys:delRow url="${ctx}/ntc/av/sample/fileSampleForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/sample/updateAvFileSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="avFileSample:audit">
+                               		<shiro:hasPermission name="avFileSample:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -122,7 +122,7 @@
 							 			<sys:delRow url="${ctx}/ntc/av/picIpForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updatePicIpValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="avPicIp:audit">
+                               		<shiro:hasPermission name="avPicIp:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -119,7 +119,7 @@
 							 			<sys:delRow url="${ctx}/ntc/av/picUrlForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvPicUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="avPicUrl:audit">
+                               		<shiro:hasPermission name="avPicUrl:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp

@@ -121,7 +121,7 @@
 							 			<sys:delRow url="${ctx}/ntc/av/sample/signSampleForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/sample/updateAvSignSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="avSignSample:audit">
+                               		<shiro:hasPermission name="avSignSample:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -459,7 +459,7 @@
                                         <sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
                                     <%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
-                               		<shiro:hasPermission name="avVoip:audit">
+                               		<shiro:hasPermission name="avVoip:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp

@@ -123,7 +123,7 @@
                                       	 </shiro:hasPermission>
                                       <!--   <button type="button" class="btn btn-default">
                                             <i class="fa fa-download"></i> 导出</button> -->
-                                    		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':audit')}">
+                                    		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':confirm')}">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -130,7 +130,7 @@
 	                                        <sys:delRow url="${ctx}${urlPrefix}/delete?functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="delete"></sys:delRow>
                                         	<sys:delRow url="${ctx}${urlPrefix}/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
                                         </shiro:hasPermission>
-                                   		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':audit')}">
+                                   		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':confirm')}">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp

@@ -131,7 +131,7 @@
                                             <i class="fa fa-download"></i> 导出</button> -->
                                     </c:if>
                                      <c:if test="${audit==1}">
-                                    		<shiro:hasPermission name="cfg:complex:audit">
+                                    		<shiro:hasPermission name="cfg:complex:confirm">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp

@@ -122,7 +122,7 @@
 							 			<sys:delRow url="${ctx}/cfg/dnsIp/form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/cfg/dnsIp/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-							 		<shiro:hasPermission name="dns:fake:ip:audit">
+							 		<shiro:hasPermission name="dns:fake:ip:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -108,7 +108,7 @@
 							 			<sys:delRow url="${ctx}/ntc/fileTransfer/fileDigestForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/fileTransfer/updateFileDigestValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="fileTransfer:fileDigest:audit">
+                               		<shiro:hasPermission name="fileTransfer:fileDigest:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp

@@ -154,7 +154,7 @@
 							 			<sys:delRow url="${ctx}/ntc/fileTransfer/ftpForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/fileTransfer/updateFtpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="fileTransfer:ftp:audit">
+                               		<shiro:hasPermission name="fileTransfer:ftp:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp

@@ -128,7 +128,7 @@
                                             <i class="fa fa-download"></i> 导出</button> -->
                                         </c:if>
                                    		<c:if test="${audit==1}">
-                                    		<shiro:hasPermission name="cfg:ip:audit">
+                                    		<shiro:hasPermission name="cfg:ip:confirm">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -154,7 +154,7 @@
 							 			<sys:delRow url="${ctx}/ntc/mail/mailForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/mail/updateMailCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="mail:audit">
+                               		<shiro:hasPermission name="mail:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp

@@ -106,7 +106,7 @@
 							 			<sys:delRow url="${ctx}/maintenance/dnsResStrategy/form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/maintenance/dnsResStrategy/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-							 		<shiro:hasPermission name="dns:res:strategy:audit">
+							 		<shiro:hasPermission name="dns:res:strategy:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp

@@ -109,7 +109,7 @@
 							 			<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                                    <shiro:hasPermission name="ip:mulitiplex:pool:audit">
+                                    <shiro:hasPermission name="ip:mulitiplex:pool:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp

@@ -168,7 +168,7 @@
                                             <i class="fa fa-download"></i> 导出</button> -->
                                     </c:if>
                                     <c:if test="${audit==1}">
-                                    		<shiro:hasPermission name="cfg:multiple:audit">
+                                    		<shiro:hasPermission name="cfg:multiple:confirm">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp

@@ -154,7 +154,7 @@
 							 			<sys:delRow url="${ctx}/ntc/other/bgpForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/other/updateBgpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="other:bgp:audit">
+                               		<shiro:hasPermission name="other:bgp:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp

@@ -154,7 +154,7 @@
 							 			<sys:delRow url="${ctx}/ntc/other/xmppForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/other/updatexmppCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="other:xmpp:audit">
+                               		<shiro:hasPermission name="other:xmpp:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -311,7 +311,7 @@
 							 			<sys:delRow url="${ctx}/proxy/control/httpRedirect/form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/proxy/control/httpRedirect/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="control:httpRedirect:audit">
+                               		<shiro:hasPermission name="control:httpRedirect:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp

@@ -130,7 +130,7 @@
                                             <i class="fa fa-download"></i> 导出</button> -->
                                     </c:if>
                                     <c:if test="${audit==1}">
-                                    		<shiro:hasPermission name="cfg:string:audit">
+                                    		<shiro:hasPermission name="cfg:string:confirm">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp

@@ -153,7 +153,7 @@
 							 			<sys:delRow url="${ctx}/ntc/website/dnsForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/website/updateDnsCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="website:dns:audit">
+                               		<shiro:hasPermission name="website:dns:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -311,7 +311,7 @@
 							 			<sys:delRow url="${ctx}/ntc/website/httpForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/website/updateHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="website:http:audit">
+                               		<shiro:hasPermission name="website:http:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp

@@ -153,7 +153,7 @@
 							 			<sys:delRow url="${ctx}/ntc/website/sslForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/website/updateSslCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="website:ssl:audit">
+                               		<shiro:hasPermission name="website:ssl:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp

@@ -106,7 +106,7 @@
                                       	 </shiro:hasPermission>
                                       <!--   <button type="button" class="btn btn-default">
                                             <i class="fa fa-download"></i> 导出</button> -->
-                                    		<shiro:hasPermission name="whitelist:domain:audit">
+                                    		<shiro:hasPermission name="whitelist:domain:confirm">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>

src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp

@@ -127,7 +127,7 @@
 	                                        <sys:delRow url="${ctx}/ntc/whitelist/ip/delete?functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
                                         	<sys:delRow url="${ctx}/ntc/whitelist/ip/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
                                         </shiro:hasPermission>
-                                   		<shiro:hasPermission name="whitelist:ip:audit">
+                                   		<shiro:hasPermission name="whitelist:ip:confirm">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>