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

将策略分组、欺骗ip、dns策略、bgp、音视频文本、文件摘要、http内容替换业务Controller方法返回对象修改为redirectAttribute

Browse Source
This commit is contained in:
duandongmei
2018-07-02 14:07:47 +08:00
parent d36e618a4d
commit ab0ed9ce05
7 changed files with 220 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java
View File

@@ -36,7 +36,10 @@ import com.nis.web.controller.BaseController;
@RequestMapping("${adminPath}/proxy/control")
public class ControlPolicyController extends BaseController{
@RequestMapping(value = {"httpReqReplace/list"})
public String reqList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity){
public String reqList(Model model,HttpServletRequest request
,HttpServletResponse response
,@ModelAttribute("cfg")HttpBodyCfg entity
,RedirectAttributes redirectAttributes){
Page<HttpBodyCfg> page = controlPolicyService.findPage(new Page<HttpBodyCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
@@ -44,7 +47,10 @@ public class ControlPolicyController extends BaseController{
}
@RequestMapping(value = {"httpReqReplace/form"})
@RequiresPermissions(value={"proxy:contol:httpReqReplace:config"})
public String reqForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")HttpBodyCfg cfg){
public String reqForm(Model model,HttpServletRequest request
,HttpServletResponse response,String ids
,@ModelAttribute("cfg")HttpBodyCfg cfg
,RedirectAttributes redirectAttributes){
if(!StringUtil.isEmpty(ids)){
cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids));
initUpdateFormCondition(model, cfg);
@@ -56,16 +62,17 @@ public class ControlPolicyController extends BaseController{
}
@RequestMapping(value = {"httpReqReplace/saveOrUpdate"})
public String reqSaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
public String reqSaveOrUpdate(Model model,HttpServletRequest request
,HttpServletResponse response,
@ModelAttribute("cfg")HttpBodyCfg cfg,
@ModelAttribute("areaCfgIds")String areaCfgIds){
@ModelAttribute("areaCfgIds")String areaCfgIds
,RedirectAttributes redirectAttributes){
try{
controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
addMessage(model,"save_success");
addMessage(redirectAttributes,"save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(model,"save_failed");
addMessage(redirectAttributes,"save_failed");
}
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+cfg.getFunctionId();
@@ -73,12 +80,15 @@ public class ControlPolicyController extends BaseController{
@RequestMapping(value = {"httpReqReplace/delete"})
@RequiresPermissions(value={"proxy:contol:httpReqReplace:config"})
public String reqDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){
public String reqDelete(Integer isAudit,Integer isValid,String ids
,Integer functionId
,RedirectAttributes redirectAttributes){
controlPolicyService.update(isAudit,isValid,ids,functionId);
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId;
}
@RequestMapping(value = {"httpReqReplace/audit"})
public String reqAudit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
public String reqAudit(Integer isAudit,Integer isValid,String ids
,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -86,8 +96,7 @@ public class ControlPolicyController extends BaseController{
try {
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("配置下发失败："+e.getMessage());
logger.error("配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
}
}
@@ -96,7 +105,9 @@ public class ControlPolicyController extends BaseController{
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId;
}
@RequestMapping(value = {"httpResReplace/list"})
public String reslist(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity){
public String reslist(Model model,HttpServletRequest request
,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity
,RedirectAttributes redirectAttributes){
Page<HttpBodyCfg> page = controlPolicyService.findPage(new Page<HttpBodyCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
@@ -104,7 +115,10 @@ public class ControlPolicyController extends BaseController{
}
@RequestMapping(value = {"httpResReplace/form"})
@RequiresPermissions(value={"proxy:contol:httpResReplace:config"})
public String resForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")HttpBodyCfg cfg){
public String resForm(Model model,HttpServletRequest request
,HttpServletResponse response,String ids
,@ModelAttribute("cfg")HttpBodyCfg cfg
,RedirectAttributes redirectAttributes){
if(!StringUtil.isEmpty(ids)){
cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids));
initUpdateFormCondition(model, cfg);
@@ -116,16 +130,17 @@ public class ControlPolicyController extends BaseController{
}
@RequestMapping(value = {"httpResReplace/saveOrUpdate"})
public String resSaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
public String resSaveOrUpdate(Model model,HttpServletRequest request
,HttpServletResponse response,
@ModelAttribute("cfg")HttpBodyCfg cfg,
@ModelAttribute("areaCfgIds")String areaCfgIds){
@ModelAttribute("areaCfgIds")String areaCfgIds
,RedirectAttributes redirectAttributes){
try{
controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
addMessage(model,"save_success");
addMessage(redirectAttributes,"save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(model,"save_failed");
addMessage(redirectAttributes,"save_failed");
}
return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+cfg.getFunctionId();
@@ -133,12 +148,15 @@ public class ControlPolicyController extends BaseController{
@RequestMapping(value = {"httpResReplace/delete"})
@RequiresPermissions(value={"proxy:contol:httpResReplace:config"})
public String resDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){
public String resDelete(Integer isAudit,Integer isValid
,String ids,Integer functionId
,RedirectAttributes redirectAttributes){
controlPolicyService.update(isAudit,isValid,ids,functionId);
return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+functionId;
}
@RequestMapping(value = {"httpResReplace/audit"})
public String resAudit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
public String resAudit(Integer isAudit,Integer isValid,String ids
,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -147,7 +165,7 @@ public class ControlPolicyController extends BaseController{
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("配置下发失败："+e.getMessage());
logger.error("配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
}
}