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 cfec10a32..8c410ad42 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1279,15 +1279,15 @@ public class AppCfgController extends BaseController { public String updateAppTopicDomainCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { try { appCfgService.updateAppTopicDomainCfgValid(isValid,ids,functionId); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); } catch (Exception e) { logger.error("app主题网站删除失败",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 +"/app/topicDomainCfgList?functionId="+functionId; @@ -1360,7 +1360,7 @@ public class AppCfgController extends BaseController { if(e instanceof MaatConvertException) { addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -1510,7 +1510,7 @@ public class AppCfgController 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(); } @@ -1552,7 +1552,7 @@ public class AppCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("top export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -1595,7 +1595,7 @@ public class AppCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("appIp export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -1642,7 +1642,7 @@ public class AppCfgController 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/iplist/list?functionId="+entity.getFunctionId(); } @@ -1688,7 +1688,7 @@ public class AppCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("Domain export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -1734,7 +1734,7 @@ public class AppCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("App ssl 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/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index ccb280079..dffcc740a 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -353,7 +353,7 @@ public class AppFeatureCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("Appfeature 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/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index 7f697f60d..115661813 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -201,7 +201,7 @@ public class BasicProtocolController extends BaseController { public String updateAppPolicyCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { try { appCfgService.updateAppPolicyCfgValid(isValid,ids,functionId); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); } catch (Exception e) { logger.error("基础协议信息保存失败",e); if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { @@ -279,7 +279,7 @@ public class BasicProtocolController 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/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index 5e8244cb8..5d23516b8 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -317,7 +317,7 @@ public class EncryptedTunnelBehaviorController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("TunnelBehavior 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/GroupAreaController.java b/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java index 18138a9a7..c108268e0 100644 --- a/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java +++ b/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java @@ -84,10 +84,10 @@ public class GroupAreaController extends BaseController { public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) { try { groupAreaService.deldete(ids,isValid); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success","delete_success"); } catch (Exception e) { logger.error("删除失败",e); - addMessage(redirectAttributes, "delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList"; } diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index f10796bf2..e72a8941e 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -63,22 +63,22 @@ public class RequestInfoController extends BaseController{ // 保存用户信息 logger.info(requestInfo.getId()+"修改成功"); requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success","save_success"); }else{ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ logger.info(requestInfo.getRequestNumber()+"重复数据"); - addMessage(model, "save_failed"); + addMessage(model,"error","save_failed"); return form(requestInfo, model); } // 保存用户信息 requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success","save_success"); logger.info(requestInfo.getId()+"保存成功"); } } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(model, "save_failed"); + addMessage(model,"error","save_failed"); } return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -105,7 +105,7 @@ public class RequestInfoController extends BaseController{ public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] exId = ids.split(","); requestInfoService.requestExamine(exId); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success","save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -119,7 +119,7 @@ public class RequestInfoController extends BaseController{ public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ String[] noId = ids.split(","); requestInfoService.requestExamineNo(noId); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success","save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -133,7 +133,7 @@ public class RequestInfoController extends BaseController{ public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] canclelId = ids.split(","); requestInfoService.requestCancelExamine(canclelId); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success","save_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } @@ -147,7 +147,7 @@ public class RequestInfoController extends BaseController{ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ String[] delId = ids.split(","); requestInfoService.delete(delId); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success","delete_success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; } 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 6838eb8a7..31d3269f3 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 @@ -230,10 +230,10 @@ public class IpMultiplexPoolCfgController extends BaseController { if(!StringUtil.isEmpty(ids)){ ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId); } - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); }catch(Exception e){ logger.error(e); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId; } @@ -298,7 +298,7 @@ public class IpMultiplexPoolCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("snat export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -336,7 +336,7 @@ public class IpMultiplexPoolCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("dnat 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/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index adcc1f375..53f192ae4 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 @@ -141,7 +141,7 @@ public class DdosCfgController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("ddos 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/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index e2e716c0d..579abca55 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -241,7 +241,7 @@ public class IpMultiplexController extends CommonController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("snat export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -287,7 +287,7 @@ public class IpMultiplexController extends CommonController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("dnat 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/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index ef8f157b6..a15119add 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 @@ -616,11 +616,11 @@ public class AvContentController extends BaseController { if(e instanceof MaatConvertException) { e.printStackTrace(); logger.error("Stream Media 信息保存失败",e); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("Stream Media 信息保存失败",e); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId(); 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 30d8314f9..bfb4c882e 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 @@ -85,11 +85,11 @@ public class FileTransferCfgController extends BaseController{ if(e instanceof MaatConvertException) { e.printStackTrace(); logger.error("ftp信息保存失败",e); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("ftp信息保存失败",e); - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId(); @@ -148,11 +148,11 @@ public class FileTransferCfgController extends BaseController{ if(e instanceof MaatConvertException) { e.printStackTrace(); logger.info("ftp配置删除失败："+e.getMessage());; - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("ftp配置删除失败",e); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } } return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId; @@ -171,16 +171,16 @@ public class FileTransferCfgController extends BaseController{ entity.setFunctionId(functionId); try { fileTransferCfgService.auditFtpCfg(entity,isAudit); - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"success","audit_success"); } catch ( Exception e) { if(e instanceof MaatConvertException) { e.printStackTrace(); logger.error("ftp配置下发失败："+e.getMessage());; - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); }else { e.printStackTrace(); logger.error("ftp配置下发失败",e); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"error","audit_failed"); } } } @@ -256,8 +256,6 @@ public class FileTransferCfgController extends BaseController{ } fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds); addMessage(redirectAttributes,"success","save_success"); - } catch (MaatConvertException e) { - addMessage(redirectAttributes, "request_service_failed"); } catch ( Exception e) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { addMessage(redirectAttributes,"error","request_service_failed"); @@ -554,7 +552,7 @@ public class FileTransferCfgController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("ftp export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -642,7 +640,7 @@ public class FileTransferCfgController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("p2p export failed",e); - addMessage(redirectAttributes, "export_failed"); + addMessage(redirectAttributes,"error","export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } @@ -682,7 +680,7 @@ public class FileTransferCfgController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("file 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/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index cd49074fe..0028fdf88 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 @@ -276,7 +276,7 @@ public class MailCfgController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("mail 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 1641591c7..914639112 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 @@ -403,7 +403,7 @@ public class HttpRedirectPolicyController 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/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 5afd0a4e5..59daec728 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 @@ -147,7 +147,7 @@ public class InterceptController extends CommonController{ entity.setFunctionId(functionId); try { interceptCfgService.auditInterceptIpCfg(entity,isAudit); - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"success","audit_success"); } catch ( Exception e) { logger.error("intercept ip audit failed",e); if(e instanceof MaatConvertException) { @@ -164,10 +164,10 @@ public class InterceptController extends CommonController{ public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { try { interceptCfgService.updatInterceptValid(isValid,ids,functionId); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"error","delete_success"); } catch (Exception e) { logger.error("intercept ip delete failed",e); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId; } @@ -311,7 +311,7 @@ public class InterceptController extends CommonController{ 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/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 37507b53f..bbd1db5aa 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 @@ -101,24 +101,28 @@ public class PxyObjKeyringController extends BaseController { boolean publicKeyFileflag=validCertFileContent(publicKeyFileI,"-incert"); boolean privateKeyFileflag=validCertFileContent(privateKeyFileI,"-inkey"); if(!publicKeyFileflag && !privateKeyFileflag){ - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); logger.error(publicKeyFileI.getOriginalFilename()+" and "+privateKeyFileI.getOriginalFilename()+" file non certificate file format "); throw new MultiPartNewException( this.getMsgProp().getProperty("certificate_error") ); }else if(!publicKeyFileflag){ - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); logger.error(publicKeyFileI.getOriginalFilename()+" file non public key file format "); throw new MultiPartNewException(this.getMsgProp().getProperty("public_file_error")); }else if(!privateKeyFileflag){ - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); logger.error(privateKeyFileI.getOriginalFilename()+" file non private key file format "); throw new MultiPartNewException(this.getMsgProp().getProperty("private_file_error")); } } catch (Exception e) { validFlag=false; logger.error("证书文件校验失败",e); - addMessage(redirectAttributes,"error",e.getMessage()); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } try{ @@ -160,7 +164,11 @@ public class PxyObjKeyringController extends BaseController { } }catch (Exception e) { logger.error("证书信息获取失败",e); - addMessage(redirectAttributes,"error","save_failed"); + if(e instanceof MaatConvertException) { + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + addMessage(redirectAttributes,"error","save_failed"); + } } try{ if(validFlag){ @@ -217,9 +225,9 @@ public class PxyObjKeyringController extends BaseController { }catch(Exception e){ logger.error("证书上传失败",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","request_service_failed"); }else { - addMessage(redirectAttributes,"error",e.getMessage()); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -383,7 +391,7 @@ public class PxyObjKeyringController extends BaseController { this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("pxyObjKeyring 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/dashboard/TrafficStatisticsReportController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java index beecd4610..e66608cec 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java @@ -86,6 +86,29 @@ public class TrafficStatisticsReportController extends BaseController { List accountList=(List) map.get("accountList"); model.addAttribute("nasIpList", nasIpList); model.addAttribute("accountList", accountList); + if(StringUtil.isBlank(account)&&accountList!=null&&accountList.size()>0&&!"3".equals(searchBusinessType)) { + Map accountMap = (Map) accountList.get(0); + String firstAccount=(String) accountMap.get("account"); + String userString = HttpClientUtil.get(userUrl+"&searchAccount="+firstAccount); + // 指定用户 查询 + Gson usergson = new GsonBuilder().create(); + userJsonList = usergson.fromJson(userString, new TypeToken(){}.getType()); + userList = (ArrayList) userJsonList.get("data"); + model.addAttribute("userList", userList); + model.addAttribute("searchAccount", firstAccount); + } + if(StringUtil.isBlank(nasIp)&&nasIpList!=null&&nasIpList.size()>0&&!"2".equals(searchBusinessType)) { + Map IpMap = (Map) nasIpList.get(0); + String firstIp=(String) IpMap.get("nasIp"); + String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+firstIp); + // 指定IP查询 + Gson ipgson = new GsonBuilder().create(); + ipJsonList = ipgson.fromJson(ipString, new TypeToken(){}.getType()); + ipList = (ArrayList) ipJsonList.get("data"); + model.addAttribute("ipList", ipList); + model.addAttribute("searchNasIp", firstIp); + + } if("2".endsWith(searchBusinessType)&&!StringUtil.isBlank(account)) { String userString = HttpClientUtil.get(userUrl+"&searchAccount="+account); diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index e97b09ddc..789f0df25 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -421,7 +421,7 @@ function ajaxinfo(){ url:'${ctx}/dashboard/traffic/info', type : "get" , dataType:'json', - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (data){ var loopConnNum =loopConnNum= data.loopConnNum; var rejectNum =data.rejectNum; @@ -547,16 +547,19 @@ function protocolList(){ url: '${ctx}/dashboard/protocol', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (rs) { if(rs!=null&&rs.length>0&&rs[0].error!=null){ top.$.jBox.tip("", ""); return; }else{ echart_1(rs); - closeTip(); } - }, + closeTip(); + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } @@ -567,16 +570,19 @@ function ipActiveList(){ url: '${ctx}/dashboard/ipActive', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (rs) { if(rs!=null&&rs.length>0&&rs[0].error!=null){ top.$.jBox.tip("", ""); return; }else{ echart_main(rs); - closeTip(); } - }, + closeTip(); + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } @@ -587,7 +593,7 @@ function portActiveList(){ url: '${ctx}/dashboard/portActive', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 beforeSend: function () { var msg = "Reloading..."; @@ -632,7 +638,10 @@ function portActiveList(){ } } closeTip(); - }, + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } @@ -643,16 +652,19 @@ function appTypeList(){ url: '${ctx}/dashboard/app', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (rs) { if(rs!=null&&rs.length>0&&rs[0].error!=null){ top.$.jBox.tip("", ""); return; }else{ echart_3(rs); - closeTip(); } - }, + closeTip(); + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } @@ -663,7 +675,7 @@ function systemList(){ url: '${ctx}/dashboard/osList', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 beforeSend: function () { var msg = "Reloading..."; @@ -709,9 +721,12 @@ function systemList(){ } //终端图-操作系统 echart_2(rs.reverse()); - closeTip(); } - }, + closeTip(); + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } // 点击操作系统列表右侧显示 浏览器图 @@ -726,11 +741,14 @@ function osClick(osType,obj){ type : "get" , data:{"osType":osType}, dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (rs) { echart_5(rs.reverse()); closeTip(); - }, + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } //点击浏览器列表右侧显示 操作系统图 @@ -743,11 +761,14 @@ function bsClick(bsType,obj){ type : "get" , data:{"bsType":bsType}, dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (rs) { echart_2(rs.reverse()); closeTip(); - }, + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } @@ -759,7 +780,7 @@ function browserList() { url: '${ctx}/dashboard/bsList', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 beforeSend: function () { var msg = "Reloading..."; @@ -805,9 +826,12 @@ function browserList() { } //终端图-浏览器 echart_5(rs.reverse()); - closeTip(); } - }, + closeTip(); + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } @@ -818,7 +842,7 @@ function websiteList() { url: '${ctx}/dashboard/websiteList', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 beforeSend: function () { var msg = "ReLoading..."; var trLen = $("#tbodyData2 tr").length; @@ -861,9 +885,12 @@ function websiteList() { } //网站统计图 echart_4(rs.reverse()); - closeTip(); } - }, + closeTip(); + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } //点击http网站列表-显示域名图 @@ -878,11 +905,14 @@ function webClick(websiteServiceId,obj){ type : "get" , data:{"websiteServiceId":websiteServiceId}, dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (rs) { echart_6(rs); closeTip(); - }, + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } //网站主题 @@ -892,12 +922,15 @@ function topicAndDomainList(){ url: '${ctx}/dashboard/topicAndDomainList', type : "get" , dataType:"json", - cache:false,async:true, + cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时 success:function (rs) { //主题域名流量统计图 echart_topic_domain(rs); closeTip(); - }, + }, + complete:function(XMLHttpRequest,status){//超时设置 + closeTip(); + } }); } diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp index 7cb66bb00..016663c33 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp @@ -127,10 +127,10 @@
- --%>

@@ -249,11 +249,10 @@
-
-
+
+
-
-
+<%--
--%> <%-- @@ -280,14 +279,12 @@ - - - + @@ -297,13 +294,12 @@
  
- -
-
+
+
: ${searchAccount}
@@ -329,7 +325,7 @@ : ">${us.reportTime}
-
+
${us.nasIp}
@@ -354,10 +350,10 @@
-
-
-
-
+
+
+
+<%--
--%>
@@ -385,15 +381,13 @@
- - - + @@ -408,8 +402,8 @@ -
-
+
+
: ${searchNasIp}
@@ -437,7 +431,7 @@
-
+
${it.account}
diff --git a/src/main/webapp/static/global/css/layout.css b/src/main/webapp/static/global/css/layout.css index ce4f89a81..1c32bf20c 100644 --- a/src/main/webapp/static/global/css/layout.css +++ b/src/main/webapp/static/global/css/layout.css @@ -31,15 +31,15 @@ a:hover,a:focus{outline:none;text-decoration: none;} /** * 发展历程 */ -.process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 10px} -.process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block} -.process-timeline .process-body{ position: relative; height: 100%; margin-left: 0;} +.process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 25px} +.process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0; overflow:hidden;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block} +.process-timeline .process-body{ position: relative; height: 100%; margin-left: 0; overflow:hidden;} .process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 30px; position: relative; height: 300px;overflow:hidden;} .process-timeline .process-row .process-time{ position: absolute; top: 48.7%; left: 10%; -wekit-top:48.8%;} .process-timeline .process-row .process-time .time-con{ position: relative; text-align: center; } .process-timeline .process-row .process-time .time-con .pic{position: absolute; } .process-timeline .process-row .process-time .time-con .pic i{ font-size: 100px; color: #666; } -.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px;} +.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px; overflow:hidden;} .process-timeline .process-row .process-time .time-con .bgcolor{ position: absolute; border-radius: 100%; margin-top: 48px; margin-left: 10px; width: 40px; height: 40px; } .process-timeline .process-row .process-time .time-con .bgcolor.red{ background: red;} @@ -51,7 +51,7 @@ a:hover,a:focus{outline:none;text-decoration: none;} .process-timeline .process-row .process-time .time-con .orange i{ color: #ff9900;} -.process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px} +.process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px; overflow:hidden;margin-right:20px} .process-timeline .process-row .process-content{padding-bottom: 40px; } .process-timeline .process-row .process-content h2{ font-size: 16px; text-align: center;} .process-timeline .process-row .process-content p{text-indent: 0 !important; font-size: 11px !important; height: 180px;color: #888; white-space:normal; }
${data.account}${data.account}
${data.nasIp}${data.nasIp}