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

修正配置controller的消息重定向后无法传至前台的问题，使用model的模式改为redirectAttributes模式

Browse Source
This commit is contained in:
zhangwei
2018-07-02 09:45:04 +08:00
parent ad3ccdc0a2
commit 01eebad6c1
5 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
View File

@@ -46,7 +46,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
initFormCondition(model, cfg); initFormCondition(model, cfg);
} }
//查询policyGroup列表，供响应策略选择 //查询ip复用地址池配置的policyGroup列表
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2); List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2);
model.addAttribute("policyGroups", policyGroups); model.addAttribute("policyGroups", policyGroups);
@@ -56,16 +56,16 @@ public class IpMultiplexPoolCfgController extends BaseController {
@RequestMapping(value = {"/saveOrUpdate"}) @RequestMapping(value = {"/saveOrUpdate"})
@RequiresPermissions(value={"ip:mulitiplex:pool:config"}) @RequiresPermissions(value={"ip:mulitiplex:pool:config"})
public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
@ModelAttribute("cfg")IpMultiplexPoolCfg cfg){ @ModelAttribute("cfg")IpMultiplexPoolCfg cfg){
try{ try{
ipMultiplexPoolCfgService.saveOrUpdate(cfg); ipMultiplexPoolCfgService.saveOrUpdate(cfg);
addMessage(model,"save_success"); addMessage(redirectAttributes,"save_success");
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
addMessage(model,"save_failed"); addMessage(redirectAttributes,"save_failed");
} }
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+cfg.getFunctionId();
@@ -82,14 +82,15 @@ public class IpMultiplexPoolCfgController extends BaseController {
@RequestMapping(value = {"/delete"}) @RequestMapping(value = {"/delete"})
@RequiresPermissions(value={"ip:mulitiplex:pool:config"}) @RequiresPermissions(value={"ip:mulitiplex:pool:config"})
public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model,HttpServletRequest request,HttpServletResponse response){ public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model,RedirectAttributes redirectAttributes
,HttpServletRequest request,HttpServletResponse response){
try{ try{
if(!StringUtil.isEmpty(ids)){ if(!StringUtil.isEmpty(ids)){
ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId); ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
} }
addMessage(model,"delete_success"); addMessage(redirectAttributes,"delete_success");
}catch(Exception e){ }catch(Exception e){
addMessage(model,"delete_failed"); addMessage(redirectAttributes,"delete_failed");
} }
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId; return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId;
@@ -106,7 +107,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime); ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) { } catch (MaatConvertException e) {
e.printStackTrace(); e.printStackTrace();
logger.info("VOIP配置下发失败："+e.getMessage()); logger.info("IP复用地址池配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage()); addMessage(redirectAttributes, e.getMessage());
} }
} }

6
src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
View File

@@ -53,14 +53,14 @@ public class DdosCfgController extends BaseController {
@RequestMapping(value = {"/saveOrUpdate"}) @RequestMapping(value = {"/saveOrUpdate"})
@RequiresPermissions(value={"ddos:ip:config"}) @RequiresPermissions(value={"ddos:ip:config"})
public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")DdosIpCfg cfg){ @ModelAttribute("cfg")DdosIpCfg cfg, RedirectAttributes redirectAttributes){
try{ try{
ddosCfgService.saveOrUpdate(cfg); ddosCfgService.saveOrUpdate(cfg);
addMessage(model,"save_success"); addMessage(redirectAttributes,"save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
e.printStackTrace(); e.printStackTrace();
addMessage(model,"save_failed"); addMessage(redirectAttributes,"save_failed");
} }
return "redirect:" + adminPath +"/manipulation/ddos/list?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/manipulation/ddos/list?functionId="+cfg.getFunctionId();

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

@@ -92,7 +92,7 @@ public class AvController extends BaseController {
} }
//保存文件样例配置 //保存文件样例配置
@RequestMapping(value = {"/sample/saveFileSample"}) @RequestMapping(value = {"/sample/saveFileSample"})
public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response, public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,
String ids,AvFileSampleCfg entity,MultipartFile srcFile,MultipartFile sampleFile){ String ids,AvFileSampleCfg entity,MultipartFile srcFile,MultipartFile sampleFile){
try{ try{
if(srcFile!=null && sampleFile!=null && if(srcFile!=null && sampleFile!=null &&
@@ -129,14 +129,14 @@ public class AvController extends BaseController {
}catch(Exception e){ }catch(Exception e){
logger.error("文件上传失败",e); logger.error("文件上传失败",e);
e.printStackTrace(); e.printStackTrace();
addMessage(model,"file_upload_failed"); addMessage(redirectAttributes,e.getMessage());
} }
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId();
} }
//保存标志样例配置 //保存标志样例配置
@RequestMapping(value = {"/sample/saveSignSample"}) @RequestMapping(value = {"/sample/saveSignSample"})
public String saveSignSample(Model model,HttpServletRequest request,HttpServletResponse response,String ids,AvSignSampleCfg entity){ public String saveSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){
avCfgService.saveOrUpdateAvSignSample(entity); avCfgService.saveOrUpdateAvSignSample(entity);
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+entity.getFunctionId();
} }

6
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -137,14 +137,14 @@ public class HttpRedirectPolicyController extends BaseController{
@RequestMapping(value = {"saveOrUpdate"}) @RequestMapping(value = {"saveOrUpdate"})
@RequiresPermissions(value={"control:httpRedirect:config"}) @RequiresPermissions(value={"control:httpRedirect:config"})
public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo cfg){ @ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
try{ try{
httpRedirectCfgService.saveHttpCfg(cfg); httpRedirectCfgService.saveHttpCfg(cfg);
addMessage(model,"save_success"); addMessage(redirectAttributes,"save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
e.printStackTrace(); e.printStackTrace();
addMessage(model,"save_failed"); addMessage(redirectAttributes,"save_failed");
} }
return "redirect:" + adminPath +"/proxy/control/httpRedirect/list?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/proxy/control/httpRedirect/list?functionId="+cfg.getFunctionId();

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

@@ -269,7 +269,6 @@
<th><spring:message code="ip_type"/></th> <th><spring:message code="ip_type"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="type"/></th> <th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th> <th><spring:message code="attribute"/></th>
@@ -337,14 +336,7 @@
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when> <c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose> </c:choose>
</td> </td>
<td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isAreaEffective==1}">
<a href="javascript:viewAreaInfo('${ctx}','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
<spring:message code="yes"/>
</a>
</c:if>
</td>
<td>${cfg.requestName }</td> <td>${cfg.requestName }</td>
<td > <td >
<c:set var="classify"></c:set> <c:set var="classify"></c:set>