diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index d4f2f833f..93a2cd78b 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -81,14 +81,14 @@ public class AsnIpController extends BaseController{ public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){ try{ asnIpCfgService.saveAsnIpCfg(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",e.getMessage()); }else { - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } } @@ -100,11 +100,11 @@ public class AsnIpController extends BaseController{ try{ asnIpCfgService.update(cfg); - 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 +"/basics/asn/list?functionId="+cfg.getFunctionId(); @@ -116,13 +116,13 @@ public class AsnIpController extends BaseController{ ,RedirectAttributes redirectAttributes){ try{ asnIpCfgService.delete(isValid,ids); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); }catch(Exception e){ logger.error("Delete failed",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } } @@ -206,7 +206,7 @@ public class AsnIpController extends BaseController{ this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); } catch (Exception e) { logger.error("asnIp 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/basics/IpReuseIpCfgController.java b/src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java index 263df40ad..9351a5b84 100644 --- a/src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java +++ b/src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java @@ -70,11 +70,11 @@ public class IpReuseIpCfgController extends BaseController{ ,RedirectAttributes redirectAttributes) { try{ ipReuseIpCfgService.save(entity);; - 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 +"/basics/vpn/list?functionId="+entity.getFunctionId(); } @@ -86,11 +86,11 @@ public class IpReuseIpCfgController extends BaseController{ public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")IpReuseIpCfg cfg,RedirectAttributes redirectAttributes){ try{ ipReuseIpCfgService.update(cfg); - 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 +"/basics/vpn/list?functionId="+cfg.getFunctionId(); } @@ -101,13 +101,13 @@ public class IpReuseIpCfgController extends BaseController{ ,RedirectAttributes redirectAttributes){ try{ ipReuseIpCfgService.delete(isValid,ids); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); }catch(Exception e){ logger.error("Delete failed",e); if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,e.getMessage()); + addMessage(redirectAttributes,"error",e.getMessage()); }else { - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } } diff --git a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java index b16145507..1dad01ccb 100644 --- a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java @@ -68,10 +68,10 @@ public class PolicyGroupController extends BaseController { try { policyGroupInfoService.saveOrUpdate(cfg); - 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 + "/basics/policyGroup/policyGroupList"; @@ -89,10 +89,10 @@ public class PolicyGroupController extends BaseController { public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) { try { policyGroupInfoService.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 + "/basics/policyGroup/policyGroupList"; } diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java index b4027380c..02d5965c1 100644 --- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -213,10 +213,10 @@ public class ServiceDictInfoController extends BaseController { try { serviceDictInfoService.saveOrUpdate(serviceDictInfo); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "save_failed"); + addMessage(redirectAttributes,"error", "save_failed"); } return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType; @@ -236,10 +236,10 @@ public class ServiceDictInfoController extends BaseController { public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) { try { serviceDictInfoService.deleteDict(mulitId); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success", "delete_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "delete_failed"); + addMessage(redirectAttributes,"error", "delete_failed"); } return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType; } diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index d64e0ad20..1cdc37cea 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -155,10 +155,10 @@ public class SysDictInfoController extends BaseController { try { sysDictInfoService.saveOrUpdate(sysDictInfo); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "save_failed"); + addMessage(redirectAttributes,"error", "save_failed"); } return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType; @@ -175,10 +175,10 @@ public class SysDictInfoController extends BaseController { public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) { try { sysDictInfoService.deleteDict(mulitId); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success", "delete_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "delete_failed"); + addMessage(redirectAttributes,"error", "delete_failed"); } return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType; } diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java index b7e8bff1c..2a53c820f 100644 --- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -59,22 +59,22 @@ public class TaskInfoController extends BaseController{ // 保存用户信息 logger.info(taskInfo.getId()+"修改成功"); taskInfoService.saveOrUpdate(taskInfo); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); }else{ if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ logger.info(taskInfo.getTaskName()+"重复数据"); - addMessage(model, "save_failed"); + addMessage(model,"error", "save_failed"); return form(taskInfo, model); } // 保存用户信息 taskInfoService.saveOrUpdate(taskInfo); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); logger.info(taskInfo.getId()+"保存成功"); } } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(redirectAttributes, "save_failed"); + addMessage(redirectAttributes,"error", "save_failed"); } return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -101,7 +101,7 @@ public class TaskInfoController extends BaseController{ public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] exId = ids.split(","); taskInfoService.taskExamine(exId); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -115,7 +115,7 @@ public class TaskInfoController extends BaseController{ public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ String[] noId = ids.split(","); taskInfoService.taskExamineNo(noId); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -129,7 +129,7 @@ public class TaskInfoController extends BaseController{ public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ String[] canclelId = ids.split(","); taskInfoService.taskCancelExamine(canclelId); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } @@ -143,7 +143,7 @@ public class TaskInfoController extends BaseController{ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ String[] delId = ids.split(","); taskInfoService.delete(delId); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success", "delete_success"); return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; } 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 a0e5a266c..51ab68698 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1077,7 +1077,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"); } } @@ -1202,7 +1202,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"); } } @@ -1346,7 +1346,7 @@ public class AppCfgController extends BaseController { websiteDomainTopic.setIsValid(Constants.VALID_YES); appCfgService.saveDomainDict(websiteDomainTopic); }else{ - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); return "redirect:" + adminPath +"/app/topicDomainCfgList?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 0d7381efa..a133b26a9 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 @@ -270,7 +270,7 @@ public class AvController extends BaseController { ||Constants.SPEAKER_FILE_TYPE.contains(FileUtils.getSuffix(uploadSrcFile.getName(),false)) ){ if(!validateAvDuration(uploadSrcFile)){ - addMessage(redirectAttributes,"exceeds_duration_limit"); + addMessage(redirectAttributes,"error","exceeds_duration_limit"); logger.error("The duration of uploaded files exceeds the limit("+Constants.AV_DURATION_LIMIT+"s)."); throw new MultiPartNewException(this.getMsgProp().getProperty("exceeds_duration_limit")); } @@ -319,7 +319,7 @@ public class AvController extends BaseController { @RequestMapping(value = {"/sample/updateAvFileSampleValid"}) public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes){ avCfgService.updateAvFileSampleValid(isAudit,isValid,ids); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId; } //修改文件样例配置审核状态 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 c73270e1a..62d4dc1cd 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 @@ -146,7 +146,7 @@ public class FileTransferCfgController extends BaseController{ public String updateFtpCfgValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { try { fileTransferCfgService.updateFtpCfgValid(isValid,ids,functionId); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); } catch (Exception e) { if(e instanceof MaatConvertException) { e.printStackTrace(); @@ -460,15 +460,42 @@ public class FileTransferCfgController extends BaseController{ @RequestMapping(value = {"saveP2pCfg"}) @RequiresPermissions(value={"fileTransfer:p2p:config"}) - public String saveP2pCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) { - fileTransferCfgService.saveP2pCfg(entity); + public String saveP2pCfg(Model model,HttpServletRequest request,HttpServletResponse response, + String ids,CfgIndexInfo entity,RedirectAttributes redirectAttributes) { + try { + fileTransferCfgService.saveP2pCfg(entity); + addMessage(redirectAttributes,"success","save_success"); + } catch (Exception e) { + if(e instanceof MaatConvertException) { + e.printStackTrace(); + logger.error("P2P信息保存失败",e); + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + e.printStackTrace(); + logger.error("P2P信息保存失败",e); + addMessage(redirectAttributes,"error","save_failed"); + } + } return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+entity.getFunctionId(); } @RequestMapping(value = {"updateP2pCfgValid"}) @RequiresPermissions(value={"fileTransfer:p2p:config"}) - public String updateP2pCfgValid(Integer isValid,String ids,Integer functionId) { - fileTransferCfgService.updateP2pCfgValid(isValid,ids,functionId); + public String updateP2pCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { + try { + fileTransferCfgService.updateP2pCfgValid(isValid,ids,functionId); + addMessage(redirectAttributes,"success","delete_success"); + } catch (Exception e) { + if(e instanceof MaatConvertException) { + e.printStackTrace(); + logger.info("P2P配置删除失败："+e.getMessage());; + addMessage(redirectAttributes,"error","request_service_failed"); + }else { + e.printStackTrace(); + logger.error("P2P配置删除失败",e); + addMessage(redirectAttributes,"error","delete_failed"); + } + } return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId; } @@ -540,6 +567,7 @@ public class FileTransferCfgController extends BaseController{ entity.setFunctionId(functionId); try { fileTransferCfgService.auditP2pCfg(entity,isAudit); + addMessage(redirectAttributes,"success","audit_success"); } catch ( Exception e) { e.printStackTrace(); logger.info("p2p配置下发失败："+e.getMessage()); 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 3ed5ee6a2..6231cb841 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 @@ -531,7 +531,7 @@ public class PxyObjKeyringController extends BaseController { try { boolean certFileflag=validCertFileContent(certFileI,"-incert"); if(!certFileflag){ - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); logger.error(certFileI.getOriginalFilename()+" file non Certificate file format "); throw new MultiPartNewException(this.getMsgProp().getProperty("certificate_file_error")); } @@ -618,7 +618,7 @@ public class PxyObjKeyringController extends BaseController { if( crlFileI != null){ boolean certFileflag=validCertFileContent(crlFileI,"-incrl"); if(!certFileflag){ - addMessage(redirectAttributes,"save_failed"); + addMessage(redirectAttributes,"error","save_failed"); logger.error(crlFileI.getOriginalFilename()+" file non crl file format "); throw new MultiPartNewException(this.getMsgProp().getProperty("crl_file_error")); } diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java index 026f35c89..66bdd2fef 100644 --- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java +++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java @@ -168,7 +168,7 @@ public class DashboardController extends BaseController{ } catch (Exception e) { e.printStackTrace(); logger.error("活跃IP统计错误"+e); - addMessage(redirectAttributes,"request_service_failed"); + addMessage(redirectAttributes,"error","request_service_failed"); } model.addAttribute("ipActiveList", ipActiveList); diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index 6e2a1aa4c..0792b515c 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -159,10 +159,10 @@ public class SpecificServiceCfgController extends BaseController { RedirectAttributes redirectAttributes) { try { specificServiceCfgService.saveOrUpdate(specificServiceCfg); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "save_failed"); + addMessage(redirectAttributes,"error", "save_failed"); } return "redirect:" + adminPath + "/specific/specificServiceCfg/list?cfgType="+specificServiceCfg.getCfgType(); } @@ -179,10 +179,10 @@ public class SpecificServiceCfgController extends BaseController { public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){ try{ specificServiceCfgService.delete(mulitId); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); }catch (Exception e){ e.printStackTrace(); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } return "redirect:"+adminPath+"/specific/specificServiceCfg/list"; diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java index b19758281..586283fb7 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java @@ -95,10 +95,10 @@ public class SpecificServiceHostCfgController extends BaseController { public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){ try { specificServiceHostCfgService.saveOrUpdate(specificServiceHostCfg); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "save_failed"); + addMessage(redirectAttributes,"error", "save_failed"); } return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list"; } @@ -114,10 +114,10 @@ public class SpecificServiceHostCfgController extends BaseController { public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){ try{ specificServiceHostCfgService.delete(mulitId); - addMessage(redirectAttributes,"delete_success"); + addMessage(redirectAttributes,"success","delete_success"); }catch (Exception e){ e.printStackTrace(); - addMessage(redirectAttributes,"delete_failed"); + addMessage(redirectAttributes,"error","delete_failed"); } return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list"; @@ -148,7 +148,7 @@ public class SpecificServiceHostCfgController extends BaseController { write(request,response, fileName).dispose(); return null; } catch (Exception e) { - addMessage(redirectAttributes, msgProp.getProperty("import_template_failed")+e.getMessage()); + addMessage(redirectAttributes,"error", msgProp.getProperty("import_template_failed")+e.getMessage()); } return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list"; } diff --git a/src/main/java/com/nis/web/controller/sys/AreaController.java b/src/main/java/com/nis/web/controller/sys/AreaController.java index 65525a239..4b076207a 100644 --- a/src/main/java/com/nis/web/controller/sys/AreaController.java +++ b/src/main/java/com/nis/web/controller/sys/AreaController.java @@ -70,7 +70,7 @@ public class AreaController extends BaseController { @RequestMapping(value = "saveOrUpdate") public String saveOrUpdate(SysArea sysArea, Model model, RedirectAttributes redirectAttributes) { areaService.saveOrUpdate(sysArea); - addMessage(redirectAttributes, "保存区域'" + sysArea.getName() + "'成功"); + addMessage(redirectAttributes,"success", "保存区域'" + sysArea.getName() + "'成功"); String id = sysArea.getParentId().equals(0l) ? "" : String.valueOf(sysArea.getParentId()); return "redirect:" + adminPath + "/sys/area/list?id="+id+"&parentIds="+sysArea.getParent().getParentIds(); @@ -82,7 +82,7 @@ public class AreaController extends BaseController { public String delete(SysArea area, RedirectAttributes redirectAttributes) { areaService.delete(area); - addMessage(redirectAttributes, "删除区域成功"); + addMessage(redirectAttributes,"success", "删除区域成功"); return "redirect:" + adminPath + "/sys/area/list?id="+area.getParentId()+"&parentIds="+area.getParent().getParentIds(); } diff --git a/src/main/java/com/nis/web/controller/sys/DictController.java b/src/main/java/com/nis/web/controller/sys/DictController.java index d165ccb31..745215a7b 100644 --- a/src/main/java/com/nis/web/controller/sys/DictController.java +++ b/src/main/java/com/nis/web/controller/sys/DictController.java @@ -68,10 +68,10 @@ public class DictController extends BaseController { dictService.saveOrUpdate(sysDictName); //删除字典缓存 CacheUtils.remove(Constants.CACHE_DICT_MAP); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "save_failed"); + addMessage(redirectAttributes,"error", "save_failed"); } return "redirect:" + adminPath + "/sys/dict/list"; @@ -85,10 +85,10 @@ public class DictController extends BaseController { dictService.deleteDict(id); //删除字典缓存 CacheUtils.remove(Constants.CACHE_DICT_MAP); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success", "delete_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "delete_failed"); + addMessage(redirectAttributes,"error", "delete_failed"); } diff --git a/src/main/java/com/nis/web/controller/sys/MenuController.java b/src/main/java/com/nis/web/controller/sys/MenuController.java index 4e1cc2c98..abb419d8f 100644 --- a/src/main/java/com/nis/web/controller/sys/MenuController.java +++ b/src/main/java/com/nis/web/controller/sys/MenuController.java @@ -71,12 +71,12 @@ public class MenuController extends BaseController { @RequestMapping(value = "saveOrUpdate") public String saveOrUpdate(SysMenu menu, Model model, RedirectAttributes redirectAttributes) { if(!UserUtils.getUser().isAdmin()){ - addMessage(redirectAttributes, "越权操作，只有超级管理员才能添加或修改数据！"); + addMessage(redirectAttributes,"error", "越权操作，只有超级管理员才能添加或修改数据！"); return "redirect:" + adminPath + "/sys/role/?repage"; } menuService.saveOrUpdateMenu(menu); - addMessage(redirectAttributes, "保存菜单'" + menu.getName() + "'成功"); + addMessage(redirectAttributes,"success", "保存菜单'" + menu.getName() + "'成功"); return "redirect:" + adminPath + "/sys/menu/"; } @@ -89,7 +89,7 @@ public class MenuController extends BaseController { // addMessage(redirectAttributes, "删除菜单失败, 不允许删除顶级菜单或编号为空"); // }else{ menuService.deleteMenu(menu); - addMessage(redirectAttributes, "删除菜单成功"); + addMessage(redirectAttributes,"success", "删除菜单成功"); // } return "redirect:" + adminPath + "/sys/menu/"; } diff --git a/src/main/java/com/nis/web/controller/sys/OfficeController.java b/src/main/java/com/nis/web/controller/sys/OfficeController.java index ae1445fa3..ab74a378a 100644 --- a/src/main/java/com/nis/web/controller/sys/OfficeController.java +++ b/src/main/java/com/nis/web/controller/sys/OfficeController.java @@ -99,7 +99,7 @@ public class OfficeController extends BaseController { public String saveOrUpdate(SysOffice office, Model model, RedirectAttributes redirectAttributes) { officeService.saveOrUpdate(office); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId()); return "redirect:" + adminPath + "/sys/office/list?id="+id+"&parentIds="+office.getParentIds(); @@ -114,7 +114,7 @@ public class OfficeController extends BaseController { // addMessage(redirectAttributes, "删除机构失败, 不允许删除顶级机构或编号空"); // }else{ officeService.delete(office); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success", "delete_success"); // } String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId()); 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 b111f9220..6fcece6ad 100644 --- a/src/main/java/com/nis/web/controller/sys/RoleController.java +++ b/src/main/java/com/nis/web/controller/sys/RoleController.java @@ -143,11 +143,11 @@ public class RoleController extends BaseController { public String saveOrUpdate(SysRole role, Model model, RedirectAttributes redirectAttributes) { if (!"true".equals(checkName(role.getOldName(), role.getName()))){ - addMessage(model, "save_failed"); + addMessage(model,"error", "save_failed"); return form(role, model); } roleService.saveOrUpdate(role); - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); return "redirect:" + adminPath + "/sys/role/?repage"; } @@ -155,7 +155,7 @@ public class RoleController extends BaseController { @RequestMapping(value = "delete") public String delete(SysRole role, RedirectAttributes redirectAttributes) { roleService.deleteRole(role); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success", "delete_success"); return "redirect:" + adminPath + "/sys/role/?repage"; } @@ -195,16 +195,16 @@ public class RoleController extends BaseController { if (UserUtils.getUser().getId().equals(userId)) { /*format(getMsgProp().get("single_file_upload_size_error").toString(), role.getName(),user.getName());*/ - addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！"); + addMessage(redirectAttributes,"error", "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！"); }else { if (user.getUserRoleList().size() <= 1){ - addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。"); + addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。"); }else{ Boolean flag = systemService.outUserInRole(role, user); if (!flag) { - addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！"); + addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！"); }else { - addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！"); + addMessage(redirectAttributes,"success", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！"); } } } diff --git a/src/main/java/com/nis/web/controller/sys/UserController.java b/src/main/java/com/nis/web/controller/sys/UserController.java index 198b828f5..adca25bc4 100644 --- a/src/main/java/com/nis/web/controller/sys/UserController.java +++ b/src/main/java/com/nis/web/controller/sys/UserController.java @@ -97,7 +97,7 @@ public class UserController extends BaseController{ return form(user, model); }*/ if (!"true".equals(checkLoginName(user.getOldLoginId(), user.getLoginId()))){ - addMessage(model, "save_failed"); + addMessage(model,"error", "save_failed"); return form(user, model); } // 角色数据有效性验证，过滤不在授权内的角色 @@ -115,7 +115,7 @@ public class UserController extends BaseController{ if (user.getLoginId().equals(UserUtils.getUser().getLoginId())){ UserUtils.clearCache(); } - addMessage(redirectAttributes, "save_success"); + addMessage(redirectAttributes,"success", "save_success"); return "redirect:" + adminPath + "/sys/user/list?repage"; } @@ -125,12 +125,12 @@ public class UserController extends BaseController{ public String delete(SysUser user, RedirectAttributes redirectAttributes) { if (UserUtils.getUser().getId().equals(user.getId())){ - addMessage(redirectAttributes, "delete_failed"); + addMessage(redirectAttributes,"error", "delete_failed"); }else if (user.isAdmin()){ - addMessage(redirectAttributes, "delete_failed_admin"); + addMessage(redirectAttributes,"error", "delete_failed_admin"); }else{ userService.deleteUser(user); - addMessage(redirectAttributes, "delete_success"); + addMessage(redirectAttributes,"success", "delete_success"); } return "redirect:" + adminPath + "/sys/user/list?repage"; } @@ -205,7 +205,7 @@ public class UserController extends BaseController{ new ExportExcel("用户数据", SysUser.class).setDataList(getMsgProp(),page.getList(),null).write(response, fileName).dispose(); return null; } catch (Exception e) { - addMessage(redirectAttributes, "导出用户失败！失败信息："+e.getMessage()); + addMessage(redirectAttributes,"error", "导出用户失败！失败信息："+e.getMessage()); } return "redirect:" + adminPath + "/sys/user/list?repage"; } diff --git a/src/main/java/com/nis/web/dao/UserDao.xml b/src/main/java/com/nis/web/dao/UserDao.xml index c33c61d54..61f2087fc 100644 --- a/src/main/java/com/nis/web/dao/UserDao.xml +++ b/src/main/java/com/nis/web/dao/UserDao.xml @@ -22,7 +22,7 @@ diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp index c3f252b37..0f8b887f2 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp @@ -211,7 +211,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index 407c786c9..88d39f6af 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -199,7 +199,7 @@ label.errorShow { - +
hidden " >
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp index 12ebb72ff..1f46f64df 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp @@ -37,7 +37,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index de1154b3c..cc362bc58 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -265,7 +265,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index 476d21819..1f2c429eb 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -143,7 +143,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp index de02873bb..b33933a52 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp @@ -37,7 +37,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 31d6ff148..847d43915 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -294,7 +294,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp index c05132b6c..64cd0e776 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp @@ -22,7 +22,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 78bc78da6..5e99fe3ee 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -153,7 +153,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp index bbc6c222b..26817f023 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp @@ -240,7 +240,7 @@ - +
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 8d11aa8d7..395070309 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -302,7 +302,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp index 3c4a94474..cf0cc6c3c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp @@ -348,7 +348,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp index cfe14a6d1..b8407622b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp @@ -269,7 +269,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp index 05e20068a..b692de196 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -278,7 +278,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 5d3041fca..800fe3940 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -330,7 +330,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index e33e926a0..caad6afa6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -362,7 +362,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index a703de5dd..842597f93 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -330,7 +330,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 7c3a31cda..a3cde41b0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -328,7 +328,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index ffbe3d1db..fa782b66e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -285,7 +285,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp index b46b28cd5..f924e40e9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp @@ -87,7 +87,7 @@ $(function(){
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index b5b1f88a7..5b59472e2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -354,7 +354,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index 2394db2f5..0f5904537 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -267,7 +267,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index bd367c57a..39b327a4c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -339,7 +339,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 2489c421a..e87e0a864 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -312,7 +312,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 9c6da670d..64346fb4c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -309,7 +309,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 548f18069..b2b1a77d3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -362,7 +362,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index 851adad36..6b5e8ca79 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -334,7 +334,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 278924e28..b48176d57 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -348,7 +348,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index ef929dfbe..9dddd5c06 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -349,7 +349,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 09be2d5e7..11bbc0179 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -293,7 +293,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 434efd08d..a6713b69c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -275,7 +275,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp index 326899ab6..a5af9f12c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp @@ -295,7 +295,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp index 48ce82a38..993d4ef74 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp @@ -221,7 +221,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userView.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userView.jsp index 0c9402948..d52aab636 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userView.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userView.jsp @@ -31,7 +31,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index a5947b915..e2dce0bc9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -348,7 +348,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp index cdd356879..c84e82274 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp @@ -335,7 +335,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index f0742c74d..77f242f62 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -540,7 +540,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp index f9ff51600..61301572b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp @@ -262,7 +262,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp index 3e9f000cd..92e10df77 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp @@ -270,7 +270,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index d96238ae9..e55ebd46f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -22,7 +22,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 27e7bf193..f76c7cb04 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -165,7 +165,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp b/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp index b70d5f596..d9c83a404 100644 --- a/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp @@ -11,7 +11,7 @@ $(document).ready(function() {
- +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index c410fa20e..12494a417 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -346,7 +346,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 15367cb76..d073cb15b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -345,7 +345,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 0cc8ed2b7..a74860c96 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -326,7 +326,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp index 659469627..78f6e3e5d 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp @@ -29,7 +29,7 @@ - +

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp index 9c7973912..af29c61ae 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp @@ -174,7 +174,7 @@
- + <%--
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp index ffbfcd1f3..2c46ff8b1 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp @@ -80,7 +80,7 @@ }); }); - +
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp index dae267a8e..8f29af99c 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -276,7 +276,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp index 89d3c70c1..8062c97ae 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp @@ -107,7 +107,7 @@ function selectP(){
- +
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp index 20f789b95..bc9d91407 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp @@ -372,7 +372,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/sys/areaForm.jsp b/src/main/webapp/WEB-INF/views/sys/areaForm.jsp index d76727757..a45ba2957 100644 --- a/src/main/webapp/WEB-INF/views/sys/areaForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/areaForm.jsp @@ -31,7 +31,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/sys/areaIndex.jsp b/src/main/webapp/WEB-INF/views/sys/areaIndex.jsp index ba3956197..d23fa8c89 100644 --- a/src/main/webapp/WEB-INF/views/sys/areaIndex.jsp +++ b/src/main/webapp/WEB-INF/views/sys/areaIndex.jsp @@ -11,7 +11,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/sys/areaList.jsp b/src/main/webapp/WEB-INF/views/sys/areaList.jsp index 40e20f2c3..053f2a5ce 100644 --- a/src/main/webapp/WEB-INF/views/sys/areaList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/areaList.jsp @@ -49,7 +49,7 @@
  • 区域列表
  • 区域添加
    •  - +
    diff --git a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp index 9fda44767..287167177 100644 --- a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp @@ -85,7 +85,7 @@ - +

    区域名称区域编码区域类型经度纬度备注操作
    diff --git a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp index a75faf449..1bcbaac80 100644 --- a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp @@ -134,7 +134,7 @@ - +
    diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp index 4486905e6..1e87af24b 100644 --- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp @@ -272,7 +272,7 @@
    - +
    diff --git a/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp b/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp index b7d7ca1c7..0e0246ad8 100644 --- a/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp +++ b/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp @@ -33,7 +33,7 @@ - +
    diff --git a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp index 7fb886fbc..06419671f 100644 --- a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp @@ -57,7 +57,7 @@ - +
    diff --git a/src/main/webapp/WEB-INF/views/sys/menuList.jsp b/src/main/webapp/WEB-INF/views/sys/menuList.jsp index 1cd861d22..3c1a4c496 100644 --- a/src/main/webapp/WEB-INF/views/sys/menuList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/menuList.jsp @@ -84,7 +84,7 @@
    - +
    diff --git a/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp b/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp index 01688f9ce..0e204533d 100644 --- a/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp +++ b/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp @@ -30,7 +30,7 @@
    - +
    diff --git a/src/main/webapp/WEB-INF/views/sys/officeList.jsp b/src/main/webapp/WEB-INF/views/sys/officeList.jsp index cc5b23a11..abf3f5097 100644 --- a/src/main/webapp/WEB-INF/views/sys/officeList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/officeList.jsp @@ -63,7 +63,7 @@ <%--
  • 机构添加
    •  --%>
    - +