diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 0fc7af453..7b3748f1e 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -320,13 +320,15 @@ public class BaseController { * 添加Flash消息 * * @param message + * @param messageType 消息类型:info、success、warning、error、loading */ - protected void addMessage(RedirectAttributes redirectAttributes, String... messages) { + protected void addMessage(RedirectAttributes redirectAttributes,String messageType, String... messages) { StringBuilder sb = new StringBuilder(); for (String message : messages) { sb.append(message).append(messages.length > 1 ? "
" : ""); } redirectAttributes.addFlashAttribute("message", sb.toString()); + redirectAttributes.addFlashAttribute("messageType", messageType); } /** @@ -3620,7 +3622,7 @@ public class BaseController { } } catch (Exception e) { - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", e.getMessage()); e.printStackTrace(); } } diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index a0fc4eaae..59afca4b5 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -240,9 +240,9 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app策略配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",""); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -372,9 +372,9 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app协议IP配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -493,9 +493,9 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app http配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -611,9 +611,9 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app协议domain配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -730,9 +730,9 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app协议byte配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -847,12 +847,11 @@ public class AppCfgController extends BaseController { try { appCfgService.auditAppSslCfg(entity,isAudit); } catch (Exception e) { - e.printStackTrace(); logger.error("app SSL配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -986,12 +985,11 @@ public class AppCfgController extends BaseController { try { appCfgService.auditAppTcpCfg(entity,isAudit); } catch (Exception e) { - e.printStackTrace(); logger.error("app SSL配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -1099,9 +1097,9 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app Header配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -1257,14 +1255,13 @@ public class AppCfgController extends BaseController { entity.setFunctionId(functionId); try { appCfgService.auditAppTopicDomainCfg(entity,isAudit); - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"success","audit_success"); } catch (Exception e) { - e.printStackTrace(); logger.error("app主题网站配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -1407,9 +1404,9 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("appBuiltinFeature audit failed", e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } diff --git a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index f500c6606..19460b070 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -159,7 +159,11 @@ public class AppFeatureCfgController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.info("app 特征配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); + } catch (Exception e) { + e.printStackTrace(); + logger.info("app 特征配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error", "audit_failed"); } } return "redirect:" + adminPath +"/app/feature/multiFeatureCfgList?functionId="+functionId; diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index 2a23b0d9f..e2fd227c7 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -173,16 +173,16 @@ public class BasicProtocolController extends BaseController { entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL); try { appCfgService.auditAppPolicyCfg(entity,isAudit); - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"success","audit_success"); } catch (Exception e) { if(e instanceof MaatConvertException) { e.printStackTrace(); logger.info("app策略配置下发失败:"+e.getMessage());; - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("app策略配置下发失败",e); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/configuration/CommonController.java b/src/main/java/com/nis/web/controller/configuration/CommonController.java index 05e068b50..baabced8c 100644 --- a/src/main/java/com/nis/web/controller/configuration/CommonController.java +++ b/src/main/java/com/nis/web/controller/configuration/CommonController.java @@ -126,10 +126,10 @@ public class CommonController extends BaseController { cfg.setEditTime(new Date()); ipCfgService.updateIpCfg(cfg); } - addMessage(model,"save_success"); + addMessage(model,"success","save_success"); }catch(Exception e){ logger.error("保存失败",e); - addMessage(model,"save_failed"); + addMessage(model,"error","save_failed"); } } public void _saveOrUpdateDomain(String cfgName,RedirectAttributes model, HttpUrlCfg cfg) { @@ -149,30 +149,30 @@ public class CommonController extends BaseController { cfg.setEditTime(new Date()); domainService.updateStringCfg(cfg); } - addMessage(model,"save_success"); + addMessage(model,"success","save_success"); }catch(Exception e){ logger.error("保存失败",e); - addMessage(model,"save_failed"); + addMessage(model,"error","save_failed"); } } public void _deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { model.addAttribute("cfgName", cfgName); try{ ipCfgService.deleteIp(ids,compileIds,functionId.intValue()); - addMessage(model,"delete_success"); + addMessage(model,"success","delete_success"); }catch(Exception e){ logger.error("删除失败", e); - addMessage(model,"delete_failed"); + addMessage(model,"error","delete_failed"); } } public void _deleteDomain(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { model.addAttribute("cfgName", cfgName); try{ domainService.deleteDomain(ids,compileIds,functionId.intValue()); - addMessage(model,"delete_success"); + addMessage(model,"success","delete_success"); }catch(Exception e){ logger.error("删除失败", e); - addMessage(model,"delete_failed"); + addMessage(model,"error","delete_failed"); } } public void _auditIp(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { @@ -191,13 +191,13 @@ public class CommonController extends BaseController { bean.setIsValid(cfg.getIsValid()); ipCfgService.audit(bean); } - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"success","audit_success"); }catch(MaatConvertException e){ logger.error("审核失败", e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }catch(Exception e){ logger.error("审核失败", e); - addMessage(redirectAttributes, "audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } public void _auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { @@ -217,13 +217,13 @@ public class CommonController extends BaseController { domain.setIsValid(cfg.getIsValid()); domainService.auditDomain(domain); } - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"success","audit_success"); }catch(MaatConvertException e){ logger.error("审核失败", e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", e.getMessage()); }catch(Exception e){ logger.error("审核失败", e); - addMessage(redirectAttributes, "audit_failed"); + addMessage(redirectAttributes,"error", "audit_failed"); } } /*public void _importIp(RedirectAttributes redirectAttributes,MultipartFile file,IpPortCfg ipCfg) { @@ -328,7 +328,7 @@ public class CommonController extends BaseController { } } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "导出失败!失败信息:"+e.getMessage()); + addMessage(redirectAttributes,"error", "导出失败!失败信息:"+e.getMessage()); } } } diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index e58eef02e..d464a39a4 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -194,16 +194,16 @@ public class EncryptedTunnelBehaviorController extends BaseController { entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR); try { appCfgService.auditAppPolicyCfg(entity,isAudit); - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"success","audit_success"); } catch (Exception e) { if(e instanceof MaatConvertException) { e.printStackTrace(); logger.info("加密隧道配置下发失败:"+e.getMessage());; - throw new MaatConvertException(""); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("加密隧道配置下发失败",e); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index 5ececa34d..afb1bdf0b 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -107,7 +107,11 @@ public class DnsIpCfgController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.info("dns fake ip配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); + } catch (Exception e) { + e.printStackTrace(); + logger.info("dns fake ip配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error", "audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index 950c3abfb..2430174ba 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -126,7 +126,9 @@ public class DnsResStrategyController extends BaseController { try { dnsResStrategyService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); + } catch (Exception e) { + addMessage(redirectAttributes,"error", "audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index 4a137f84e..5d68d6fb7 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java @@ -115,7 +115,11 @@ public class IpMultiplexPoolCfgController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.info("IP复用地址池配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); + }catch (Exception e) { + e.printStackTrace(); + logger.info("IP复用地址池配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error", "audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index bfee4e6ce..b1030fb70 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -90,7 +90,11 @@ public class DdosCfgController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.info("dns fake ip配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); + } catch (Exception e) { + e.printStackTrace(); + logger.info("dns fake ip配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error","audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java index 7e34dec44..279d01b1d 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java @@ -89,7 +89,11 @@ public class AsnPolicyCfgController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.info("dns fake ip配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); + } catch (Exception e) { + e.printStackTrace(); + logger.info("dns fake ip配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error","audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index 17a707e41..0ec56227c 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -88,16 +88,16 @@ public class AvContentController extends BaseController { CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdateAvVoip(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ if(e instanceof MaatConvertException) { e.printStackTrace(); logger.error("voip 信息保存失败",e); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("voip 信息保存失败",e); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+cfg.getFunctionId(); @@ -169,11 +169,11 @@ public class AvContentController extends BaseController { if(e instanceof MaatConvertException) { e.printStackTrace(); logger.error("voip 信息审核失败",e); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("voip 信息审核失败",e); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } } return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId; @@ -213,11 +213,11 @@ public class AvContentController extends BaseController { if(e instanceof MaatConvertException) { e.printStackTrace(); logger.error("VOIP配置下发失败:"+e.getMessage());; - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("VOIP配置下发失败",e); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } @@ -369,11 +369,11 @@ public class AvContentController extends BaseController { ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdateContIp(cfg,areaCfgIds); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+cfg.getFunctionId(); @@ -402,7 +402,10 @@ public class AvContentController extends BaseController { avContentCfgService.auditContIp(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { logger.error("Cont Ip配置下发失败",e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); + }catch (Exception e) { + logger.error("Cont Ip配置下发失败",e); + addMessage(redirectAttributes,"error","audit_failed"); } } @@ -474,11 +477,11 @@ public class AvContentController extends BaseController { ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdatePicIp(cfg,areaCfgIds); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } return "redirect:" + adminPath +"/ntc/av/picIpList?functionId="+cfg.getFunctionId(); @@ -508,7 +511,11 @@ public class AvContentController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.error("Pic Ip配置下发失败",e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error",""); + } catch (Exception e) { + e.printStackTrace(); + logger.error("Pic Ip配置下发失败",e); + addMessage(redirectAttributes,"error", "audit_failed"); } } @@ -635,7 +642,7 @@ public class AvContentController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.info("Cont Url配置下发失败",e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "audit_failed"); } } @@ -726,10 +733,10 @@ public class AvContentController extends BaseController { ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdatePicUrl(cfg,areaCfgIds); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+cfg.getFunctionId(); @@ -759,7 +766,7 @@ public class AvContentController extends BaseController { } catch (MaatConvertException e) { e.printStackTrace(); logger.info("Pic Url配置下发失败",e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", e.getMessage()); } } @@ -867,7 +874,7 @@ public class AvContentController extends BaseController { return null; } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "导出失败!失败信息:"+e.getMessage()); + addMessage(redirectAttributes,"error", "导出失败!失败信息:"+e.getMessage()); } return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+entity.getFunctionId(); @@ -958,7 +965,7 @@ public class AvContentController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("stream export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -1048,7 +1055,7 @@ public class AvContentController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("voip export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index fa2ba7b1e..f594d63e3 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -355,10 +355,10 @@ public class AvController extends BaseController { e.printStackTrace(); if(e instanceof MaatConvertException) { logger.info("音视频文件样例配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { logger.error("auditAvFileSample failed",e); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -397,10 +397,10 @@ public class AvController extends BaseController { e.printStackTrace(); if(e instanceof MaatConvertException) { logger.info("音视频标识样例配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { logger.error("auditAvAudioSignSample failed",e); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"success","audit_failed"); } } } @@ -423,17 +423,16 @@ public class AvController extends BaseController { for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) { avCfgService.saveOrUpdateAvSignSample(avSignSampleCfg); } - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId; } } catch (Exception e1) { - e1.printStackTrace(); if(e1 instanceof MaatConvertException) { logger.error("预置失败",e1); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { logger.error("auditAvSignSample failed",e1); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } //修改下发配置 @@ -449,15 +448,15 @@ public class AvController extends BaseController { // if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){ try { avCfgService.auditAvSignSample(avSignSampleCfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ e.printStackTrace(); if(e instanceof MaatConvertException) { logger.error("下发失败",e); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { logger.error("auditAvSignSample failed",e); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } } @@ -506,7 +505,7 @@ public class AvController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("ysp export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index 8e917ac5f..560ca1d91 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -145,7 +145,11 @@ public class BgpCfgController extends BaseController{ } catch (MaatConvertException e) { e.printStackTrace(); logger.error("bgp配置下发失败",e); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); + }catch (Exception e) { + e.printStackTrace(); + logger.error("bgp配置下发失败",e); + addMessage(redirectAttributes,"error","audit_failed"); } } return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+functionId; @@ -226,7 +230,7 @@ public class BgpCfgController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("dns export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index db22d9426..525eb43df 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -146,12 +146,11 @@ public class IpController extends BaseController{ } } catch (Exception e) { - e.printStackTrace(); logger.info("ip配置下发失败:"+e.getMessage()); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); }else { - addMessage(redirectAttributes, "audit_failed"); + addMessage(redirectAttributes,"error", "audit_failed"); } } @@ -232,6 +231,7 @@ public class IpController extends BaseController{ exportTemplate(request,response,redirectAttributes,regionDict,serviceDict,requestId); } catch (Exception e) { logger.error("export_failed", e); + addMessage(redirectAttributes,"error", "export_failed"); } } @@ -417,7 +417,7 @@ public class IpController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("ip addr export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index e6bfcce27..1bc1eabe0 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -221,10 +221,10 @@ public class WebsiteController extends BaseController{ websiteCfgService.auditHttpCfg(entity,isAudit); } catch (MaatConvertException e) { logger.error("http配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, "request_service_failed"); + addMessage(redirectAttributes,"error", "request_service_failed"); }catch (Exception e) { logger.error("http配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, "audit_failed"); + addMessage(redirectAttributes,"error", "audit_failed"); } } return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+functionId; @@ -317,7 +317,7 @@ public class WebsiteController extends BaseController{ } catch (MaatConvertException e) { e.printStackTrace(); logger.info("ssl配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", e.getMessage()); } } return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId; @@ -403,7 +403,11 @@ public class WebsiteController extends BaseController{ } catch (MaatConvertException e) { e.printStackTrace(); logger.info("dns配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); + }catch (Exception e) { + e.printStackTrace(); + logger.info("dns配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error", e.getMessage()); } } return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+functionId; @@ -648,7 +652,7 @@ public class WebsiteController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("http export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId(); } @@ -746,7 +750,7 @@ public class WebsiteController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("dns export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -840,7 +844,7 @@ public class WebsiteController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("http export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId(); } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index 4fc1f6def..767b43b5f 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -113,10 +113,13 @@ public class WhiteListController extends CommonController{ entity.setFunctionId(functionId); try { ipCfgService.auditIpCfg(entity,isAudit); + addMessage(redirectAttributes,"success", "audit_success"); } catch (MaatConvertException e) { - e.printStackTrace(); logger.info("ip配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); + }catch (Exception e) { + logger.info("ip配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error", "audit_failed"); } } return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+entity.getFunctionId(); @@ -219,10 +222,10 @@ public class WhiteListController extends CommonController{ public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) { try{ domainService.deleteWhiteDomain(ids); - addMessage(model,"delete_success"); + addMessage(model,"success","delete_success"); }catch(Exception e){ logger.error("删除失败", e); - addMessage(model,"delete_failed"); + addMessage(model,"error","delete_failed"); } return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId; } @@ -244,7 +247,11 @@ public class WhiteListController extends CommonController{ } catch (MaatConvertException e) { e.printStackTrace(); logger.info("domain配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); + }catch (Exception e) { + e.printStackTrace(); + logger.info("domain配置下发失败:"+e.getMessage()); + addMessage(redirectAttributes,"error","audit_failed"); } } return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId; @@ -321,7 +328,7 @@ public class WhiteListController extends CommonController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("ip white export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -378,7 +385,7 @@ public class WhiteListController extends CommonController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("ip white export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 12b9cfe53..97b2a240b 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -234,7 +234,7 @@ public class HttpRedirectPolicyController extends BaseController{ } catch (MaatConvertException e) { e.printStackTrace(); logger.info("http重定向配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", e.getMessage()); } } return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+functionId; diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 7053d5f14..e1cfab15e 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -276,7 +276,9 @@ public class PxyObjKeyringController extends BaseController { try { pxyObjKeyringService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); + }catch (Exception e) { + addMessage(redirectAttributes,"error", "audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/sys/RoleController.java b/src/main/java/com/nis/web/controller/sys/RoleController.java index d6b1ca348..b111f9220 100644 --- a/src/main/java/com/nis/web/controller/sys/RoleController.java +++ b/src/main/java/com/nis/web/controller/sys/RoleController.java @@ -133,7 +133,7 @@ public class RoleController extends BaseController { newNum++; } } - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); return "redirect:" + adminPath + "/sys/role/assign?id="+role.getId(); } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp index d7c552f34..d0c9191cd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp @@ -96,6 +96,20 @@ $(function(){
+
+
+ +
+ + +
+
+
+
@@ -116,7 +130,9 @@ $(function(){
-
+
+
+
@@ -129,8 +145,6 @@ $(function(){
-
-
@@ -186,20 +200,6 @@ $(function(){
-
-
- -
- - -
-
-
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index e477e4a14..cdf533047 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -111,7 +111,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index c359249e2..b883dc897 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -331,7 +331,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index cfde277b0..8d717bda9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -332,7 +332,7 @@ - +