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

(1)白名单页面url调整

Browse Source 
(2)ip白名单导入导出增加
(3)修复白名单权限audit写成aduit
This commit is contained in:
wangxin
2018-07-04 16:56:02 +08:00
parent 0d80f52157
commit 35bd6b16b4
6 changed files with 80 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
@@ -22,7 +25,7 @@ import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.web.controller.BaseController;
import com.nis.web.controller.configuration.CommonController;
/**
* 白名单
@@ -31,9 +34,9 @@ import com.nis.web.controller.BaseController;
*/
@Controller
@RequestMapping("${adminPath}/ntc/whitelist")
public class WhiteListController extends BaseController{
public class WhiteListController extends CommonController{
@RequestMapping(value = {"ipList"})
@RequestMapping(value = {"ip/list"})
@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:audit"},logical=Logical.OR)
public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
cfg.setTableName(IpPortCfg.getTablename());
@@ -43,7 +46,7 @@ public class WhiteListController extends BaseController{
initPageCondition(model,cfg);
return "/cfg/whitelist/ipList";
}
@RequestMapping(value = {"domainList"})
@RequestMapping(value = {"domain/list"})
@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:audit"},logical=Logical.OR)
public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
cfg.setTableName(HttpUrlCfg.getTablename());
@@ -53,7 +56,7 @@ public class WhiteListController extends BaseController{
initPageCondition(model,cfg);
return "/cfg/whitelist/domainList";
}
@RequestMapping(value = {"ipForm"})
@RequestMapping(value = {"ip/form"})
@RequiresPermissions(value={"whitelist:ip:config"})
public String ipForm(Model model,String ids,BaseIpCfg entity) {
if(StringUtils.isNotBlank(ids)){
@@ -72,7 +75,7 @@ public class WhiteListController extends BaseController{
return "/cfg/whitelist/ipForm";
}
@RequestMapping(value = {"domainForm"})
@RequestMapping(value = {"domain/form"})
@RequiresPermissions(value={"whitelist:domain:config"})
public String domainForm(Model model,String ids,HttpUrlCfg entity) {
if(StringUtils.isNotBlank(ids)){
@@ -90,7 +93,7 @@ public class WhiteListController extends BaseController{
return "/cfg/whitelist/domainForm";
}
@RequestMapping(value = {"saveOrUpdateIp"})
@RequestMapping(value = {"ip/saveOrUpdate"})
public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) {
cfg.setTableName(IpPortCfg.getTablename());
logger.info("saveOrUpdateIp loaded");
@@ -112,9 +115,9 @@ public class WhiteListController extends BaseController{
logger.error("保存失败",e);
addMessage(model,"save_failed");
}
return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+cfg.getFunctionId();
return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"saveOrUpdateDomain"})
@RequestMapping(value = {"domain/saveOrUpdate"})
public String saveOrUpdateDomain(RedirectAttributes model, HttpUrlCfg cfg) {
cfg.setTableName(HttpUrlCfg.getTablename());
logger.info("saveOrUpdateIp loaded");
@@ -136,10 +139,10 @@ public class WhiteListController extends BaseController{
logger.error("保存失败",e);
addMessage(model,"save_failed");
}
return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+cfg.getFunctionId();
return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"deleteIp"})
@RequestMapping(value = {"ip/delete"})
@RequiresPermissions("whitelist:ip:config")
public String deleteIp(String ids,Integer functionId,RedirectAttributes model) {
try{
@@ -149,9 +152,9 @@ public class WhiteListController extends BaseController{
logger.error("删除失败", e);
addMessage(model,"delete_failed");
}
return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+functionId;
return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+functionId;
}
@RequestMapping(value = {"deleteDomain"})
@RequestMapping(value = {"domain/delete"})
@RequiresPermissions("whitelist:domain:config")
public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) {
try{
@@ -161,10 +164,10 @@ public class WhiteListController extends BaseController{
logger.error("删除失败", e);
addMessage(model,"delete_failed");
}
return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+functionId;
return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
}
@RequestMapping(value = {"auditIp"})
@RequiresPermissions("whitelist:ip:aduit")
@RequestMapping(value = {"ip/audit"})
@RequiresPermissions("whitelist:ip:audit")
public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
try{
for(String id:ids.split(",")){
@@ -183,15 +186,15 @@ public class WhiteListController extends BaseController{
addMessage(redirectAttributes,"audit_success");
}catch(MaatConvertException e){
logger.error("审核失败", e);
addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
addMessage(redirectAttributes, e.getMessage());
}catch(Exception e){
logger.error("审核失败", e);
addMessage(redirectAttributes, "audit_failed");
}
return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+cfg.getFunctionId();
return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"auditDomain"})
@RequiresPermissions("whitelist:domain:aduit")
@RequestMapping(value = {"domain/audit"})
@RequiresPermissions("whitelist:domain:audit")
public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) {
try{
List<HttpUrlCfg> beans=domainService.getListByCfgId(ids);
@@ -209,11 +212,30 @@ public class WhiteListController extends BaseController{
addMessage(redirectAttributes,"audit_success");
}catch(MaatConvertException e){
logger.error("审核失败", e);
addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
addMessage(redirectAttributes, e.getMessage());
}catch(Exception e){
logger.error("审核失败", e);
addMessage(redirectAttributes, "audit_failed");
}
return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+cfg.getFunctionId();
return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+cfg.getFunctionId();
}
//ip配置导入
@RequestMapping(value = "ip/import", method=RequestMethod.POST)
public String importIp(String cfgName,RedirectAttributes redirectAttributes,
@RequestParam("file") MultipartFile file,IpPortCfg cfg) {
this._importIp(cfgName,redirectAttributes, file,cfg);
return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
}
//ip模板下载
@RequestMapping(value = "ip/import/template")
public void importFileTemplate(HttpServletRequest request,HttpServletResponse response,
RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
}
//ip配置导出
@RequestMapping(value = "ip/export")
public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){
this._exportIp(model, request, response, entity, ids, redirectAttributes);
}
}