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 59afca4b5..3c172e48c 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -199,14 +199,14 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppPolicyCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { logger.error("saveAppPolicyCfg failed",e); e.printStackTrace(); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -240,7 +240,7 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app策略配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",""); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"error","audit_failed"); } @@ -320,14 +320,14 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppIpCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("saveAppIpCfg failed",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -372,7 +372,7 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app协议IP配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"error","audit_failed"); } @@ -453,14 +453,14 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppHttpCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("saveAppHttpCfg failed", e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -493,7 +493,7 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app http配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"error","audit_failed"); } @@ -572,13 +572,13 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppDomainCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -611,7 +611,7 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app协议domain配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"error","audit_failed"); } @@ -690,14 +690,14 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppByteCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("saveAppByteCfg failed",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -730,7 +730,7 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app协议byte配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"error","audit_failed"); } @@ -810,14 +810,14 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppSslCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("saveAppSslCfg failed", e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -932,12 +932,12 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppTcpeCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("saveAppTcpCfg failed",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"save_failed"); } @@ -1057,12 +1057,12 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppHeaderCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("saveAppHeaderCfg failed",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"save_failed"); } @@ -1097,7 +1097,7 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("app Header配置下发失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"error","audit_failed"); } @@ -1217,16 +1217,16 @@ public class AppCfgController extends BaseController { entity.setDomain(entity.getDomain()); } appCfgService.saveOrUpdateAppTopicDomainCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_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,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -1353,12 +1353,12 @@ public class AppCfgController extends BaseController { } appBuiltInFeatureService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ e.printStackTrace(); logger.error("appBuiltinFeatureFileSaveOrUpdate failed",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"save_failed"); } @@ -1404,7 +1404,7 @@ public class AppCfgController extends BaseController { e.printStackTrace(); logger.error("appBuiltinFeature audit failed", e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { 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 19460b070..8250de8e6 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -129,7 +129,11 @@ public class AppFeatureCfgController extends BaseController { appMultiFeatureCfgService.saveOrUpdateAppFeatureCfg(entity); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + addMessage(redirectAttributes,"error", "save_failed"); + } } return "redirect:" + adminPath +"/app/feature/multiFeatureCfgList?functionId="+entity.getFunctionId(); @@ -158,11 +162,11 @@ public class AppFeatureCfgController extends BaseController { appMultiFeatureCfgService.auditAppFeatureCfg(entity,isAudit); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("app 特征配置下发失败:"+e.getMessage()); + logger.error("app 特征配置下发失败:"+e.getMessage()); addMessage(redirectAttributes,"error", "request_service_failed"); } catch (Exception e) { e.printStackTrace(); - logger.info("app 特征配置下发失败:"+e.getMessage()); + logger.error("app 特征配置下发失败:"+e.getMessage()); addMessage(redirectAttributes,"error", "audit_failed"); } } 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 e2fd227c7..9286700d4 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -135,15 +135,15 @@ public class BasicProtocolController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppPolicyCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("基础协议信息保存失败",e); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { // addMessage(redirectAttributes,e.getMessage()); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -206,10 +206,10 @@ public class BasicProtocolController extends BaseController { logger.error("基础协议信息保存失败",e); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { e.printStackTrace(); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } } return "redirect:" + adminPath +"/basicprotocol/list?functionId="+functionId; 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 baabced8c..727954dd3 100644 --- a/src/main/java/com/nis/web/controller/configuration/CommonController.java +++ b/src/main/java/com/nis/web/controller/configuration/CommonController.java @@ -152,7 +152,11 @@ public class CommonController extends BaseController { addMessage(model,"success","save_success"); }catch(Exception e){ logger.error("保存失败",e); - addMessage(model,"error","save_failed"); + if(e instanceof MaatConvertException) { + addMessage(model,"error", "request_service_failed"); + }else { + addMessage(model,"error", "save_failed"); + } } } public void _deleteIp(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { @@ -220,7 +224,7 @@ public class CommonController extends BaseController { addMessage(redirectAttributes,"success","audit_success"); }catch(MaatConvertException e){ logger.error("审核失败", e); - addMessage(redirectAttributes,"error", e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); }catch(Exception e){ logger.error("审核失败", e); addMessage(redirectAttributes,"error", "audit_failed"); @@ -328,7 +332,7 @@ public class CommonController extends BaseController { } } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes,"error", "导出失败!失败信息:"+e.getMessage()); + addMessage(redirectAttributes,"error", "导出失败!" ); } } } 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 d464a39a4..832c43f86 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -157,14 +157,14 @@ public class EncryptedTunnelBehaviorController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppPolicyCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { e.printStackTrace(); logger.error("加密隧道信息保存失败",e); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { - throw new MaatConvertException(""); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -224,11 +224,9 @@ public class EncryptedTunnelBehaviorController extends BaseController { } catch (Exception e) { logger.error("加密隧道协议保存失败",e); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { - e.printStackTrace(); - throw new MaatConvertException(""); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - e.printStackTrace(); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } } return "redirect:" + adminPath +"/encryptedtunnelbehav/list?functionId="+functionId; diff --git a/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java b/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java index a68aac5fa..18138a9a7 100644 --- a/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java +++ b/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java @@ -14,6 +14,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.configuration.GroupAreaInfo; +import com.nis.exceptions.CallExternalProceduresException; +import com.nis.exceptions.MaatConvertException; import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; import com.nis.web.service.configuration.GroupAreaService; @@ -66,10 +68,14 @@ public class GroupAreaController extends BaseController { public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) { try { groupAreaService.saveOrUpdate(cfg); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { logger.error("新增失败",e); - addMessage(redirectAttributes, "save_failed"); + if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList"; } 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 afb1bdf0b..ef23f1d93 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 @@ -76,11 +76,15 @@ public class DnsIpCfgController extends BaseController { ,RedirectAttributes redirectAttributes){ try{ dnsIpCfgService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+cfg.getFunctionId(); @@ -167,7 +171,11 @@ public class DnsIpCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("DnsIp export failed",e); - addMessage(redirectAttributes, "export_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + 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/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index 2430174ba..e5363d814 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 @@ -82,7 +82,7 @@ public class DnsResStrategyController extends BaseController { dnsResStrategyService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ e.printStackTrace(); addMessage(redirectAttributes,"save_failed"); @@ -188,7 +188,11 @@ public class DnsResStrategyController 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"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + 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/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index 5d68d6fb7..e9f07744e 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 @@ -70,10 +70,14 @@ public class IpMultiplexPoolCfgController extends BaseController { ipMultiplexPoolCfgService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + addMessage(redirectAttributes,"error", "save_failed"); + } } return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+cfg.getFunctionId(); @@ -98,7 +102,8 @@ public class IpMultiplexPoolCfgController extends BaseController { } addMessage(redirectAttributes,"delete_success"); }catch(Exception e){ - addMessage(redirectAttributes,"delete_failed"); + logger.error(e); + addMessage(redirectAttributes,"error", "delete_failed"); } return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId; } @@ -181,10 +186,14 @@ public class IpMultiplexPoolCfgController extends BaseController { } ipMultiplexPoolCfgService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + addMessage(redirectAttributes,"error", "save_failed"); + } } return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+cfg.getFunctionId(); @@ -201,8 +210,12 @@ public class IpMultiplexPoolCfgController extends BaseController { ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("SNAT地址池管理配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("SNAT地址池管理配置下发失败:"+e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + addMessage(redirectAttributes,"error", "audit_failed"); + } } } @@ -219,6 +232,7 @@ public class IpMultiplexPoolCfgController extends BaseController { } addMessage(redirectAttributes,"delete_success"); }catch(Exception e){ + logger.error(e); addMessage(redirectAttributes,"delete_failed"); } return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId; 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 b1030fb70..414f3c6eb 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 @@ -62,11 +62,15 @@ public class DdosCfgController extends BaseController { @ModelAttribute("cfg")DdosIpCfg cfg, RedirectAttributes redirectAttributes){ try{ ddosCfgService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error",e.getMessage()); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } return "redirect:" + adminPath +"/manipulation/ddos/list?functionId="+cfg.getFunctionId(); 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 279d01b1d..ee9375f16 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 @@ -55,14 +55,14 @@ public class AsnPolicyCfgController extends BaseController { ,RedirectAttributes redirectAttributes){ try{ asnPolicyCfgService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -88,11 +88,11 @@ public class AsnPolicyCfgController extends BaseController { asnPolicyCfgService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("dns fake ip配置下发失败:"+e.getMessage()); + logger.error("dns fake ip配置下发失败:"+e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed"); } catch (Exception e) { e.printStackTrace(); - logger.info("dns fake ip配置下发失败:"+e.getMessage()); + logger.error("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 0ec56227c..352b16c18 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 @@ -603,7 +603,7 @@ public class AvContentController extends BaseController { CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdateContUrl(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ if(e instanceof MaatConvertException) { e.printStackTrace(); 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 f594d63e3..294fa1a23 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 @@ -238,16 +238,17 @@ public class AvController extends BaseController { avCfgService.saveOrUpdateAvFileSample(entity, srcFile); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("文件上传失败",e); e.printStackTrace(); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); + }else { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -258,14 +259,14 @@ public class AvController extends BaseController { public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){ try{ avCfgService.saveOrUpdateAvSignSample(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("saveAudioSignSample failed",e); e.printStackTrace(); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+entity.getFunctionId(); @@ -396,11 +397,11 @@ public class AvController extends BaseController { }catch(Exception e){ e.printStackTrace(); if(e instanceof MaatConvertException) { - logger.info("音视频标识样例配置下发失败:"+e.getMessage()); + logger.error("音视频标识样例配置下发失败:"+e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed"); }else { logger.error("auditAvAudioSignSample failed",e); - addMessage(redirectAttributes,"success","audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 16922ee84..0e8d2040b 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -35,6 +35,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.configuration.P2pHashCfg; import com.nis.domain.configuration.P2pKeywordCfg; import com.nis.domain.maat.ToMaatResult; +import com.nis.exceptions.CallExternalProceduresException; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; @@ -79,7 +80,7 @@ public class FileTransferCfgController extends BaseController{ CfgIndexInfo entity,RedirectAttributes redirectAttributes) { try { fileTransferCfgService.saveFtpCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { if(e instanceof MaatConvertException) { e.printStackTrace(); @@ -174,7 +175,7 @@ public class FileTransferCfgController extends BaseController{ } catch (MaatConvertException e) { if(e instanceof MaatConvertException) { e.printStackTrace(); - logger.info("ftp配置下发失败:"+e.getMessage());; + logger.error("ftp配置下发失败:"+e.getMessage());; addMessage(redirectAttributes,"request_service_failed"); }else { e.printStackTrace(); @@ -254,11 +255,16 @@ public class FileTransferCfgController extends BaseController{ logger.info("获取文件摘要响应信息:"+result); } fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (MaatConvertException e) { addMessage(redirectAttributes, "request_service_failed"); - } catch (IOException e) { - addMessage(redirectAttributes, "save_failed"); + } catch ( Exception e) { + if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { + addMessage(redirectAttributes,"error","request_service_failed"); + + }else { + addMessage(redirectAttributes,"error","audit_failed"); + } } return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId(); } @@ -280,9 +286,15 @@ public class FileTransferCfgController extends BaseController{ for(String id :idArray){ try { fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime); - } catch (MaatConvertException e) { + } catch ( Exception e) { logger.error("File Digest配置下发失败",e); - addMessage(redirectAttributes, e.getMessage()); + if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { + addMessage(redirectAttributes,"error","request_service_failed"); + + }else { + addMessage(redirectAttributes,"error","audit_failed"); + } + } } @@ -450,10 +462,15 @@ public class FileTransferCfgController extends BaseController{ entity.setFunctionId(functionId); try { fileTransferCfgService.auditP2pCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch ( Exception e) { e.printStackTrace(); logger.info("p2p配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { + addMessage(redirectAttributes,"error","request_service_failed"); + + }else { + addMessage(redirectAttributes,"error","audit_failed"); + } } } return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId; diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index e96778e8e..486e46bb8 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java @@ -31,6 +31,7 @@ import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.maat.ToMaatResult; +import com.nis.exceptions.CallExternalProceduresException; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; @@ -70,7 +71,7 @@ public class MailCfgController extends BaseController{ } @RequestMapping(value = {"saveMailCfg"}) @RequiresPermissions(value={"mail:config"}) - public String saveMailCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids, + public String saveMailCfg( RedirectAttributes redirectAttributes, Model model,HttpServletRequest request,HttpServletResponse response,String ids, CfgIndexInfo entity,MultipartFile file) { try { @@ -97,8 +98,13 @@ public class MailCfgController extends BaseController{ logger.info("获取文件摘要响应信息:"+result); } mailCfgService.saveMailCfg(entity,result); - } catch (IOException e) { - e.printStackTrace(); + } catch ( Exception e) { + if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { + addMessage(redirectAttributes,"error","request_service_failed"); + + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+entity.getFunctionId(); @@ -168,10 +174,15 @@ public class MailCfgController extends BaseController{ entity.setFunctionId(functionId); try { mailCfgService.auditMailCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch ( Exception e) { e.printStackTrace(); - logger.info("mail配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + logger.error("mail配置下发失败:"+e.getMessage()); + if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { + addMessage(redirectAttributes,"error","request_service_failed"); + + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } } return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+functionId; 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 1bc1eabe0..41ac544d5 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 @@ -39,6 +39,7 @@ import com.nis.domain.configuration.HttpResHeadCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; +import com.nis.exceptions.CallExternalProceduresException; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -314,10 +315,15 @@ public class WebsiteController extends BaseController{ entity.setFunctionId(functionId); try { websiteCfgService.auditSslCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch ( Exception e) { e.printStackTrace(); - logger.info("ssl配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes,"error", e.getMessage()); + logger.error("ssl配置下发失败:"+e.getMessage()); + if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { + addMessage(redirectAttributes,"error","request_service_failed"); + + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } } return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId; @@ -407,7 +413,7 @@ public class WebsiteController extends BaseController{ }catch (Exception e) { e.printStackTrace(); logger.info("dns配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes,"error", e.getMessage()); + addMessage(redirectAttributes,"error", "audit_failed"); } } return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+functionId; 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 767b43b5f..142d4d677 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 @@ -246,11 +246,11 @@ public class WhiteListController extends CommonController{ domainService.auditDomainCfg(entity,isAudit); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("domain配置下发失败:"+e.getMessage()); + logger.error("domain配置下发失败:"+e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed"); }catch (Exception e) { e.printStackTrace(); - logger.info("domain配置下发失败:"+e.getMessage()); + logger.error("domain配置下发失败:"+e.getMessage()); addMessage(redirectAttributes,"error","audit_failed"); } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java b/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java index 739a014c6..0747b1282 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java @@ -84,10 +84,14 @@ public class XmppController extends BaseController { entity.setFunctionId(functionId); try { xmppCfgService.auditXmppCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch ( Exception e) { e.printStackTrace(); logger.info("http配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes, e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","audit_failed"); + } } } return "redirect:" + adminPath +"/ntc/other/xmppList?functionId="+functionId; diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java index 6d3bd02aa..0f9dc9a35 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java @@ -69,7 +69,7 @@ public class ControlPolicyController extends BaseController{ ,RedirectAttributes redirectAttributes){ try{ controlPolicyService.saveOrUpdate(cfg,areaCfgIds); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); addMessage(redirectAttributes,"save_failed"); @@ -95,9 +95,13 @@ public class ControlPolicyController extends BaseController{ for(String id :idArray){ try { controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime,Constants.REPLACE_REQ_KEY_VALUE); - } catch (MaatConvertException e) { + } catch ( Exception e) { logger.error("配置下发失败",e); - addMessage(redirectAttributes, e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","audit_failed"); + } } } @@ -137,7 +141,7 @@ public class ControlPolicyController extends BaseController{ ,RedirectAttributes redirectAttributes){ try{ controlPolicyService.saveOrUpdate(cfg,areaCfgIds); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); addMessage(redirectAttributes,"save_failed"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java index 4c0937e5d..7394b7a91 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java @@ -28,6 +28,7 @@ import com.nis.domain.Page; import com.nis.domain.callback.ProxyFileStrategyCfg; import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult.ResponseData; +import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.FileUtils; import com.nis.util.JsonMapper; @@ -116,10 +117,14 @@ public class FileStrategyController extends CommonController { cfg.setContentLength(file.length());//文件长度 } proxyFileStrategyService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); - addMessage(redirectAttributes,"save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } }finally { if(file != null) { file.delete();//删除临时文件 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 97b2a240b..b593b0214 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 @@ -185,11 +185,15 @@ public class HttpRedirectPolicyController extends BaseController{ @ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){ try{ httpRedirectCfgService.saveHttpCfg(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); - addMessage(redirectAttributes,"save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+cfg.getFunctionId(); @@ -231,10 +235,14 @@ public class HttpRedirectPolicyController extends BaseController{ entity.setFunctionId(functionId); try { httpRedirectCfgService.auditHttpCfg(entity,isAudit); - } catch (MaatConvertException e) { + } catch ( Exception e) { e.printStackTrace(); logger.info("http重定向配置下发失败:"+e.getMessage()); - addMessage(redirectAttributes,"error", e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","audit_failed"); + } } } return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+functionId; diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index d4e971e27..135f17687 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -85,10 +85,14 @@ public class InterceptController extends CommonController{ public String saveInterceptIpCfg(RedirectAttributes redirectAttributes,Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) { try { interceptCfgService.saveInterceptCfg(entity); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); } catch (Exception e) { logger.error("save_failed", e); - addMessage(redirectAttributes,"save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+entity.getFunctionId(); } @@ -144,9 +148,13 @@ public class InterceptController extends CommonController{ try { interceptCfgService.auditInterceptIpCfg(entity,isAudit); addMessage(redirectAttributes,"audit_success"); - } catch (MaatConvertException e) { + } catch ( Exception e) { logger.error("intercept ip audit failed",e); - addMessage(redirectAttributes,"audit_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + addMessage(redirectAttributes,"error", "audit_failed"); + } } } return "redirect:" + adminPath +"/proxy/intercept/ip/list?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 e1cfab15e..6fcf4b3f5 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 @@ -110,7 +110,11 @@ public class PxyObjKeyringController extends BaseController { } catch (Exception e) { validFlag=false; logger.error("证书文件校验失败",e); - addMessage(redirectAttributes,e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + addMessage(redirectAttributes,"error", "save_failed"); + } } if(validFlag){ @@ -131,7 +135,11 @@ public class PxyObjKeyringController extends BaseController { } }catch (Exception e) { logger.error("证书信息获取失败",e); - addMessage(redirectAttributes,e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error", "request_service_failed"); + }else { + addMessage(redirectAttributes,"error", "save_failed"); + } } } if(validFlag){ @@ -184,13 +192,13 @@ public class PxyObjKeyringController extends BaseController { } pxyObjKeyringService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"save_success"); + addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("证书上传失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error", "request_service_failed"); }else { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error", "save_failed"); } } } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index e618ad7bb..84df18145 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -271,7 +271,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index 8c08f738a..9cc686c23 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -272,7 +272,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp index 15a127b64..d501c5fb0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -324,7 +324,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index 0beae209e..256eea995 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -290,7 +290,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 55ebc4f67..941d639af 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -355,7 +355,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp index a91737a04..5fb8d6036 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -272,7 +272,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp index f7b0b9cfd..af2010bde 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp @@ -252,7 +252,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index 21d054137..748de22bd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -277,7 +277,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index f93f48ee7..5c0ebd2b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -358,7 +358,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index d17bbb545..3ceacf3ae 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -355,7 +355,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 47e1b96cd..691e9abdb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -353,7 +353,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index a54ba6c91..28bc6adae 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -263,7 +263,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp index 18afee4b8..a8dfce3d9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp @@ -60,7 +60,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp index 3c6538a81..d7120c7a5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp @@ -142,7 +142,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp index a99fa76fe..e2f9558ce 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp @@ -60,7 +60,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index 92164acfd..96aac63cb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -317,7 +317,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index 5df0ad98a..4d509c87b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -496,7 +496,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 66ceea1f9..ad1166d35 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -153,7 +153,7 @@ $(document).ready(function(){ - +