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

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

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

3
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -13,7 +13,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -42,7 +41,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:confirm"},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");

5
src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java
View File

@@ -11,7 +11,6 @@ package com.nis.web.controller.configuration.manipulation;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -38,7 +37,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/manipulation/ratelimit")
public class RatelimitController extends CommonController {
@RequestMapping(value = {"/ip/list"})
@RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:confirm"},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 +45,7 @@ public class RatelimitController extends CommonController {
return "/cfg/common/ipList";
}
@RequestMapping(value = {"/domain/list"})
@RequiresPermissions(value={"domain:ratelimit:config","domain:ratelimit:confirm"},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");

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

@@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.ntc;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -27,7 +26,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/ntc/iplist")
public class IpController extends CommonController{
@RequestMapping(value = {"list"})
@RequiresPermissions(value={"iplist:config","iplist:confirm"},logical=Logical.OR)
// @RequiresPermissions(value={"iplist:config","iplist:confirm"},logical=Logical.OR)
public String list(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName, model, cfg, request, response);
model.addAttribute("urlPrefix","/ntc/iplist");

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

@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
@@ -37,7 +36,7 @@ import com.nis.web.controller.configuration.CommonController;
public class WhiteListController extends CommonController{
@RequestMapping(value = {"ip/list"})
@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm"},logical=Logical.OR)
//@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm","whitelist:ip:aduit"},logical=Logical.OR)
public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
cfg.setTableName(IpPortCfg.getTablename());
Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r");
@@ -47,7 +46,7 @@ public class WhiteListController extends CommonController{
return "/cfg/whitelist/ipList";
}
@RequestMapping(value = {"domain/list"})
@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm"},logical=Logical.OR)
//@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm","whitelist:domain:aduit"},logical=Logical.OR)
public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
cfg.setTableName(HttpUrlCfg.getTablename());
Page<HttpUrlCfg> searchPage=new Page<HttpUrlCfg>(request,response,"r");

5
src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
View File

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

5
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

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