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

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

Browse Source
This commit is contained in:
wangxin
2018-07-13 12:14:19 +08:00
parent 4d0a341d67
commit 317d0ff9d7
51 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

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

2
src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
View File

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

4
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

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

4
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

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

2
src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
View File

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

6
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

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

8
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

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

4
src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java
View File

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