diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 4c461be7c..c74b8e1db 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -2209,10 +2209,16 @@ public class ExportExcel { int j=0; sheets=new HashMap<>(); rownums=new HashMap<>(); + int num=0; for (String title : titleList) { List headerList=headerMap.get(title); List commentList=commentMap.get(title); - Sheet sheet = wb.createSheet(StringUtil.isEmpty(msgProp.get(title)) ? title:msgProp.get(title).toString()); + String titleName=StringUtil.isEmpty(msgProp.get(title)) ? title:msgProp.get(title).toString(); + if(num > 0){ + titleName+=String.valueOf(num); + } + Sheet sheet = wb.createSheet(titleName); + num++; rownums.put(title, 0); sheets.put(title, sheet); this.styles = createStyles(wb); 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..d78ccde84 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,18 +116,27 @@ 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"); } } return "redirect:" + adminPath +"/basics/asn/list?functionId="+functionId; } + + @RequestMapping(value = {"/ajaxDeleteAsnIp"}) + public void ajaxDeleteAsnIp(String ids, HttpServletRequest request, HttpServletResponse response){ + try{ + asnIpCfgService.ajaxDeleteAsnIp(ids); + }catch(Exception e){ + logger.error("Delete failed",e); + } + } /** * ajax设置Name * @param model @@ -206,7 +215,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/LogSearchController.java b/src/main/java/com/nis/web/controller/configuration/LogSearchController.java index 2c8257044..32ecb96fc 100644 --- a/src/main/java/com/nis/web/controller/configuration/LogSearchController.java +++ b/src/main/java/com/nis/web/controller/configuration/LogSearchController.java @@ -23,6 +23,9 @@ public class LogSearchController extends BaseController{ * searchService: serviceId */ // 获取相应日志检索菜单URL + if(entity.getFunctionId()!=null && entity.getFunctionId().equals(635)){ + entity.setFunctionId(8);//关键字配置的日志查询定位至http日志 + } String logUrl = menuService.getLogUrl(entity.getFunctionId()); // Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction()); 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 878dce3a5..cae77fafc 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -67,7 +67,7 @@ public class RequestInfoController extends BaseController{ }else{ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ logger.info(requestInfo.getRequestNumber()+"重复数据"); - addMessage(model,"error","save_failed"); + addMessage(redirectAttributes,"error","save_failed"); return form(requestInfo, model); } // 保存用户信息 @@ -78,7 +78,7 @@ public class RequestInfoController extends BaseController{ } catch (Exception e) { logger.error(e.getMessage()); e.printStackTrace(); - addMessage(model,"error","save_failed"); + addMessage(redirectAttributes,"error","save_failed"); } 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 1f8bd42f5..1457add36 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 @@ -100,7 +100,7 @@ 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,"error", "delete_failed"); 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..b32b3f652 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")); } @@ -289,6 +289,8 @@ public class AvController extends BaseController { addMessage(redirectAttributes,"error","request_service_failed"); }else if(e instanceof CallExternalProceduresException) { addMessage(redirectAttributes,"error","call_external_procedures_failed"); + }else if(e instanceof MultiPartNewException) { + addMessage(redirectAttributes,"error",e.getMessage()); }else{ addMessage(redirectAttributes,"error","save_failed"); } @@ -319,7 +321,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/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 6d4f8dd9e..d6e03e5e8 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 @@ -192,7 +192,7 @@ public class InterceptController extends CommonController{ public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { try { interceptCfgService.updatInterceptValid(isValid,ids,functionId); - addMessage(redirectAttributes,"error","delete_success"); + addMessage(redirectAttributes,"success","delete_success"); } catch (Exception e) { logger.error("intercept ip delete failed",e); addMessage(redirectAttributes,"error","delete_failed"); 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/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index 361870dbc..51d1f6e68 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -115,9 +115,9 @@ public class TrafficStatisticsInfoController extends BaseController { public String bandwidthList(Model model){ Calendar cal = Calendar. getInstance (); cal.setTime(new Date()); - String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间 + String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间 cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1); - String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime()); + String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime()); model.addAttribute("beginDate", oneHoursAgo); model.addAttribute("endDate", now); return "/dashboard/trafficBandwidthList"; @@ -126,7 +126,14 @@ public class TrafficStatisticsInfoController extends BaseController { * 流量统计滚动动作查看详情页面 */ @RequestMapping(value={"trafficBlockList","trafficMonitorList"}) - public String serviceBlockList(@RequestParam("searchAction")String searchAction,HttpServletRequest request, HttpServletResponse response, Model model){ + public String serviceBlockList(@RequestParam("searchAction")String searchAction,Model model){ + Calendar cal = Calendar. getInstance (); + cal.setTime(new Date()); + String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间 + cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1); + String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime()); + model.addAttribute("beginDate", oneHoursAgo); + model.addAttribute("endDate", now); model.addAttribute("searchAction", searchAction); return "/dashboard/trafficActionTransList"; } @@ -135,12 +142,13 @@ public class TrafficStatisticsInfoController extends BaseController { */ @RequestMapping(value="actionEntranceTrans") @ResponseBody - public List actionTrans(@RequestParam("searchAction")String searchAction){ + public List actionTrans(String beginDate,String endDate,@RequestParam("searchAction")String searchAction){ Map fromJsonList = new HashMap(); List resultList = new ArrayList(); String url = Constants.DASHBOARD_URL+Constants.NTC_ACTION_ENTRANCE_REPORT; url=url+"?searchAction="+searchAction; try { + url = urlAddDate(url,beginDate,endDate); String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); @@ -153,13 +161,23 @@ public class TrafficStatisticsInfoController extends BaseController { } return resultList; } + /** + * + * + * url路径时间参数格式化 + * @param url + * @param beginDate + * @param endDate + * @return + * @throws URISyntaxException + */ public String urlAddDate(String url,String beginDate,String endDate) throws URISyntaxException{ if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){ Calendar cal = Calendar. getInstance (); cal.setTime(new Date()); - endDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间 + endDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间 cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1); - beginDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime()); + beginDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime()); } URIBuilder uriBuilder = new URIBuilder(url); uriBuilder.addParameter("beginDate",beginDate); @@ -239,11 +257,11 @@ public class TrafficStatisticsInfoController extends BaseController { public String protocolTypeList(Model model){ Calendar cal = Calendar. getInstance (); cal.setTime(new Date()); - String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间 + String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间 cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1); - String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime()); - model.addAttribute("searchFoundStartTime", oneHoursAgo); - model.addAttribute("searchFoundEndTime", now); + String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime()); + model.addAttribute("beginDate", oneHoursAgo); + model.addAttribute("endDate", now); return "/dashboard/trafficProtocolTypeList"; } /** @@ -251,16 +269,12 @@ public class TrafficStatisticsInfoController extends BaseController { */ @RequestMapping(value="protocolList") @ResponseBody - public List protocolList(Model model,@RequestParam(required=false)String searchFoundStartTime,@RequestParam(required=false)String searchFoundEndTime){ + public List protocolList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){ Map fromJsonList = new HashMap(); List list = new ArrayList(); String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_PROTOCOL_LIST; try { - if(!StringUtil.isBlank(searchFoundStartTime)&&!StringUtil.isBlank(searchFoundEndTime)){ - searchFoundStartTime=URLEncoder.encode(searchFoundStartTime, "UTF-8"); - searchFoundEndTime=URLEncoder.encode(searchFoundEndTime, "UTF-8"); - url+="?searchFoundStartTime="+searchFoundStartTime+"&searchFoundEndTime="+searchFoundEndTime; - } + url=urlAddDate(url,beginDate,endDate); String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); @@ -311,7 +325,14 @@ public class TrafficStatisticsInfoController extends BaseController { * App类型详细列表 */ @RequestMapping(value="appTypeList") - public String appTypeList(){ + public String appTypeList(Model model){ + Calendar cal = Calendar. getInstance (); + cal.setTime(new Date()); + String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间 + cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1); + String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime()); + model.addAttribute("beginDate", oneHoursAgo); + model.addAttribute("endDate", now); return "/dashboard/trafficAppTypeList"; } /** @@ -319,16 +340,12 @@ public class TrafficStatisticsInfoController extends BaseController { */ @RequestMapping(value="appList") @ResponseBody - public List appList(@RequestParam(value="searchFoundStartTime",required=false)String searchFoundStartTime,@RequestParam(value="searchFoundEndTime",required=false)String searchFoundEndTime){ + public List appList(@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){ Map fromJsonList = new HashMap(); List list = new ArrayList(); String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST; try { - if(!StringUtil.isBlank(searchFoundStartTime)&&!StringUtil.isBlank(searchFoundEndTime)){ - searchFoundStartTime=URLEncoder.encode(searchFoundStartTime, "UTF-8"); - searchFoundEndTime=URLEncoder.encode(searchFoundEndTime, "UTF-8"); - url+="?searchFoundStartTime="+searchFoundStartTime+"&searchFoundEndTime="+searchFoundEndTime; - } + url=urlAddDate(url,beginDate,endDate); String string = HttpClientUtil.get(url); Gson gson = new GsonBuilder().create(); fromJsonList = gson.fromJson(string, new TypeToken(){}.getType()); 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 af5177678..e4645b2e8 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java @@ -94,23 +94,29 @@ public class TrafficStatisticsReportController extends BaseController { 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"); + String firstAccount=""; + if(accountMap!=null&&accountMap.get("account")!=null){ + 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"); + Map ipMap = (Map) nasIpList.get(0); + String firstIp=""; + if(ipMap!=null&&ipMap.get("nasIp")!=null){ + 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); 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..5e2a8c3d8 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(redirectAttributes,"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..a00dab025 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(redirectAttributes,"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/java/com/nis/web/dao/basics/AsnIpCfgDao.java b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java index b074a2a2c..8830e6f96 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java @@ -25,4 +25,5 @@ public interface AsnIpCfgDao extends CrudDao{ public int deleteByAsnGroup(@Param("asnId")String asnNo); public int insertBatch(List list); public Varibles getVaribles(@Param("name")String name); + public void ajaxDeleteAsnIp(@Param("ids")String ids); } diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index 25d5f62ec..6f00e58b4 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -407,6 +407,9 @@ delete from asn_ip_cfg where cfg_id in (${ids}) + + + delete from asn_ip_cfg where asn_ip_group in (${ids}) diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml index 1134253fd..859c119db 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml @@ -450,9 +450,9 @@ AND r.is_valid = #{isValid,jdbcType=INTEGER} - + AND r.function_id = #{functionId,jdbcType=INTEGER} diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java index ce1f7a0f0..790fc367a 100644 --- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java +++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java @@ -353,9 +353,9 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isValid,String ids) { - for(String id:ids.split(",")) { + /*for(String id:ids.split(",")) { Long.parseLong(id); - } + }*/ List issuedList=new ArrayList<>(); List asnIpCfgList= asnIpCfgDao.getByIds(ids); @@ -373,7 +373,9 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { asnIpCfgDao.delete(ids); //已经下发过的,调用分组复用配置删除接口 // splitAndSend(issuedList,Constants.VALID_NO); - asnIPRegionSendToMaat(issuedList,Constants.VALID_NO); + if(issuedList.size() > 0){ + asnIPRegionSendToMaat(issuedList,Constants.VALID_NO); + } } // public List findPolicyGroupInfosByType(Integer groupId) { @@ -463,4 +465,7 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { asnNoList.clear(); } } + public void ajaxDeleteAsnIp(String ids) { + asnIpCfgDao.ajaxDeleteAsnIp(ids); + } } diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index 40ec9416a..9dc7e4811 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -674,7 +674,7 @@ public class WebsiteCfgService extends CrudService { } } //只有审核通过的配置需要下发失效动作 - if(cfgIndexInfo.getIsAudit().equals(3)){ + if(cfgIndexInfo.getIsAudit().equals(1)){ maatCfg.setCompileId(cfgIndexInfo.getCompileId()); maatCfg.setServiceId(cfgIndexInfo.getServiceId()); maatCfg.setIsValid(0);//无效 diff --git a/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java index f296c84a0..9adf35760 100644 --- a/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java +++ b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java @@ -87,6 +87,10 @@ public class SpecificServiceCfgService extends BaseService{ group.setGroupName(specificServiceCfg.getSpecServiceName()); group.setIsIssued(0); group.setGroupType(1); + if(specificServiceCfg.getCfgType()==1) { + Integer compileId = ConfigServiceUtil.getId(1, 1).get(0); + group.setCompileId(compileId); + } configGroupInfoDao.insertConfigGroupInfo(group); } if(specificServiceCfg.getSpecServiceId()==null){//新增 diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index b7f1daf31..ead27c0fe 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -217,8 +217,8 @@ select=Please Select date_list=Data List confirm_message=Confirm? export_confirm_message=The maximum number of data exported -fill_loginName=Please Enter Login Account -fill_loginPassWord=Please Enter Login Password +fill_loginName=Username +fill_loginPassWord=Password loginName_error=Account or password wrong ,Please try again. system_error=There is a problem in the system. Please try again later! save_success=Save Success @@ -612,7 +612,7 @@ version=Version encrypt_mode=Encrypt Mode hmac=Has HMAC tunnel_type=Tunnel Type -log_total=Log Total Amount +log_total=Total logs host_key=Host Key host_cookie=Host Cookie mac=Message Authentication Code @@ -1359,8 +1359,11 @@ log_search_http_monit=HTTP Monitor log_search_http_reject=HTTP Block log_search_keyword_monit=Keyword Monitor log_search_keyword_reject=Keyword Block -radius_log=RADIUS Identify -message_type=Message Type +radius_log=Radius Identify +message_type=Code nas_ip=NAS IP Address framed_ip=Framed IP Address log_user_name=User Name +av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P. +asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.) +keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration. \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index c31699198..db459d739 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -217,8 +217,8 @@ select=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 date_list=\u0421\u043F\u0438\u0441\u043E\u043A \u0434\u0430\u043D\u043D\u044B\u0445 confirm_message=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C? export_confirm_message=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u043C\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445 -fill_loginName=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043B\u043E\u0433\u0438\u043D -fill_loginPassWord=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043F\u0430\u0440\u043E\u043B\u044C +fill_loginName=\u041B\u043E\u0433\u0438\u043D +fill_loginPassWord=\u041F\u0430\u0440\u043E\u043B\u044C loginName_error=\u041B\u043E\u0433\u0438\u043D \u0438\u043B\u0438 \u043F\u0430\u0440\u043E\u043B\u044C \u043D\u0435\u0432\u0435\u0440\u043D\u044B, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437. system_error=\u0412 \u0441\u0438\u0441\u0442\u0435\u043C\u0435 \u0432\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0437\u0436\u0435! save_success=\u0423\u0441\u043F\u0435\u0448\u043D\u043E\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435 @@ -612,7 +612,7 @@ version=\u0412\u0435\u0440\u0441\u0438\u044F encrypt_mode=\u0420\u0435\u0436\u0438\u043C \u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u044F hmac=\u0418\u043C\u0435\u0435\u0442 HMAC tunnel_type=\u0422\u0438\u043F \u0442\u0443\u043D\u043D\u0435\u043B\u044F -log_total=\u041E\u0431\u0449\u0430\u044F \u0441\u0443\u043C\u043C\u0430 \u0436\u0443\u0440\u043D\u0430\u043B\u0430 +log_total=\u0421\u0443\u043C\u043C\u0430 \u0416\u0443\u0440\u043D\u0430\u043B\u0430 host_key=\u041A\u043B\u044E\u0447 \u0445\u043E\u0441\u0442\u0430 host_cookie=Cookie \u0445\u043E\u0441\u0442\u0430 mac=\u041A\u043E\u0434 \u0430\u0443\u0442\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u0438 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F @@ -1153,7 +1153,7 @@ ip_reuse_policy_object=\u041E\u0431\u044A\u0435\u043A\u0442 \u043F\u043E\u043B\u area_group_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0440\u0435\u0433\u0438\u043E\u043D\u0430\u043C\u0438 \u043F\u043E \u0433\u0440\u0443\u043F\u043F\u0435 stream_media_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u043F\u043E\u0442\u043E\u043A\u043E\u0432\u043E\u0433\u043E \u043C\u0443\u043B\u044C\u0442\u0438\u043C\u0435\u0434\u0438\u0430 new_link=\u041D\u043E\u0432\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430 -active_link=\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430\u044F +active_link=\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430 traffic_ipactive_hour_trend=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 IP \u0422\u041E\u041F 10 \u0442\u0435\u043D\u0434\u0435\u043D\u0446\u0438\u044F \u0432 \u0442\u0435\u0447\u0435\u043D\u0438\u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u0433\u043E \u043E\u0434\u043D\u043E\u0433\u043E \u0447\u0430\u0441\u0430 traffic_ipactive_hour_max=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 IP TOP10 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u0437\u0430 \u043E\u0434\u0438\u043D \u0447\u0430\u0441 ip_addr=IP @@ -1362,4 +1362,12 @@ show_available_ips=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C log_search_http_monit=HTTP \u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 log_search_http_reject=HTTP \u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 log_search_keyword_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u041A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0421\u043B\u043E\u0432 -log_search_keyword_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u041A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0421\u043B\u043E\u0432 \ No newline at end of file +log_search_keyword_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u041A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0421\u043B\u043E\u0432 +radius_log=Radius Identify +message_type=Code +nas_ip=NAS IP Address +framed_ip=Framed IP Address +log_user_name=User Name +av_tips=\u041A\u043E\u0433\u0434\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0446\u0435 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0431\u043E\u043B\u0435\u0435 1080p., \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F. +asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.) +keyword_log_tips=\u041A\u043E\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u043F\u043B\u043E\u0445\u0438\u043C, \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0434\u0435\u0434\u0443\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0433\u043E \u0436\u0443\u0440\u043D\u0430\u043B\u0430 \u0434\u0430\u043D\u043D\u043E\u0439 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 URL \u0434\u043B\u044F \u043F\u043E\u0434\u0430\u0432\u0448\u0435\u0433\u043E \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430. \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index b7bcbeb11..d507cd5d5 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1294,7 +1294,7 @@ max_cache_obj_size=\u6700\u5927\u7F13\u5B58\u5BF9\u8C61\u5927\u5C0F cache_time_error=\u7F13\u5B58\u65F6\u95F4\u4E0D\u80FD\u8D85\u8FC7 24 \u5C0F\u65F6(1440\u5206\u949F,86400\u79D2). cache_size_error=\u7F13\u5B58\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC71024TB(1048576GB,1073741824MB). ignore_qs_error=\u5FFD\u7565\u7684\u67E5\u8BE2\u53C2\u6570\u4E2D\u5305\u542B\u4E0D\u53EF\u89C1\u5B57\u7B26\u6216\u8005\u9017\u53F7 -NTC_DDOS_PROTECT_TARGET_IP=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E +NTC_DDOS_PROTECT_TARGET_IP=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E bypass=\u767D\u540D\u5355 unlimited=unlimited req_line=\u8BF7\u6C42\u884C @@ -1305,7 +1305,7 @@ set_cookie=set-Cookie\u503C req_header=\u539F\u59CB\u8BF7\u6C42\u5934 resp_header=\u539F\u59CB\u5E94\u7B54\u5934 req_body=\u539F\u59CB\u8BF7\u6C42\u4F53 -resp_body=\u539F\u59CB\u5E94\u7B54\u4F53 +resp_body=\u539F\u59CB\u5E94\u7B54\u4F53 dns_sub=DNS\u5B89\u5168\u673A\u5236 action_cache=\u7F13\u5B58 action_cache_whitelist=\u7F13\u5B58\u767D\u540D\u5355 @@ -1359,8 +1359,11 @@ log_search_http_monit=HTTP\u76D1\u6D4B log_search_http_reject=HTTP\u963B\u65AD log_search_keyword_monit=\u5173\u952E\u5B57\u76D1\u6D4B log_search_keyword_reject=\u5173\u952E\u5B57\u963B\u65AD -radius_log=RADIUS\u534F\u8BAE -message_type=\u62A5\u6587\u7C7B\u578B -nas_ip=NAS\u63A5\u5165IP -framed_ip=\u670D\u52A1\u5668\u4E0B\u53D1\u7684\u7528\u6237\u5730\u5740 -log_user_name=\u7528\u6237\u540D +radius_log=Radius \u534F\u8BAE +message_type=Code +nas_ip=NAS IP Address +framed_ip=Framed IP Address +log_user_name=User Name +av_tips=\u5BF9\u4E8E\u97F3\u89C6\u9891\u7F16\u7801\u7684\u7D22\u5F15\u4FE1\u606F\u5728\u97F3\u89C6\u9891\u6587\u4EF6\u5C3E\u90E8\u7684\u60C5\u51B5\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301\uFF0C\u5BF9\u4E8E\u5206\u8FA8\u7387\u5927\u4E8E4\u5146\u7684\u89C6\u9891\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301 +asn_ip_group_delete=(\u8BE5ASN\u7EC4\u4E0B\u7684IP\u914D\u7F6E\u4E5F\u4F1A\u88AB\u5220\u9664) +keyword_log_tips=\u6E05\u6D17\u540E\u7F51\u9875\u5173\u952E\u5B57\u65E5\u5FD7\uFF0C\u7F51\u9875\u5173\u952E\u5B57\u7BA1\u63A7\u72B6\u51B5\u4E0D\u7406\u60F3\u65F6\uFF0C\u53EF\u5C06\u6E05\u6D17\u540E\u5EFA\u8BAE\u7ED9\u51FA\u7684\u547D\u4E2D\u5173\u952E\u5B57\u7F51\u9875\u914D\u7F6E\u4E3AURL\u7BA1\u63A7 \ No newline at end of file diff --git a/src/main/resources/scripts/auto_del_file.sh b/src/main/resources/scripts/auto_del_file.sh new file mode 100644 index 000000000..dd40b51ae --- /dev/null +++ b/src/main/resources/scripts/auto_del_file.sh @@ -0,0 +1,6 @@ +#!/bin/sh +tomcat_install_dir=/home/ceiec/webTomcat +find $tomcat_install_dir/logs/ -mtime +30 -name "*.log" -exec rm -rf {} \; +find $tomcat_install_dir/logs/ -mtime +30 -name "*.txt" -exec rm -rf {} \; +find $tomcat_install_dir/logs/ -mtime +30 -name "*catalina.out.*" -exec rm -rf {} \; +find $tomcat_install_dir/webapps/ntc/WEB-INF/log/ -mtime +30 -name "*.log" -exec rm -rf {} \; diff --git a/src/main/resources/scripts/cut_nginx_logs.sh b/src/main/resources/scripts/cut_nginx_logs.sh new file mode 100644 index 000000000..462caabe3 --- /dev/null +++ b/src/main/resources/scripts/cut_nginx_logs.sh @@ -0,0 +1,29 @@ +#!/bin/bash +#function:cut nginx log files + +#set the path to nginx log files +log_files_path="/home/ceiec/nginx/logs/" +log_files_dir=${log_files_path} +#set nginx log files you want to cut +log_files_name=(access ) +#set the path to nginx. +nginx_sbin="/home/ceiec/nginx/sbin/nginx" +#Set how long you want to save +save_days=30 +############################################ +#Please do not modify the following script # +############################################ +#mkdir -p $log_files_dir +log_files_num=${#log_files_name[@]} + +#cut nginx log files +for((i=0;i<$log_files_num;i++));do +mv ${log_files_path}${log_files_name[i]}.log ${log_files_dir}${log_files_name[i]}.log_$(date -d "yesterday" +"%Y-%m-%d") +done + +#delete 30 days ago nginx log files +find $log_files_path -mtime +$save_days -exec rm -rf {} \; + +#restart nginx +#$nginx_sbin -s reload +systemctl restart nginx diff --git a/src/main/resources/scripts/help b/src/main/resources/scripts/help new file mode 100644 index 000000000..76f7d7665 --- /dev/null +++ b/src/main/resources/scripts/help @@ -0,0 +1,8 @@ +crontab -e +00 00 * * * /bin/sh /home/ceiec/nginx/sbin/cut_nginx_logs.sh +0 1 * * * /home/ceiec/webTomcat/bin/splitCatalinaOut.sh >/dev/null 2>&1 +0 2 * * * /home/ceiec/webTomcat/bin/auto_del_file.sh >/dev/null 2>&1 +/etc/rc.d/rc.local +ng_daemon.sh +redis_daemon.sh +servieDaemon.sh \ No newline at end of file diff --git a/src/main/resources/scripts/ng_daemon.sh b/src/main/resources/scripts/ng_daemon.sh new file mode 100644 index 000000000..ee050bae4 --- /dev/null +++ b/src/main/resources/scripts/ng_daemon.sh @@ -0,0 +1,11 @@ +#! /bin/bash +nginxPath=/usr/local/nginx +pidFile=$nginxPath/logs/nginx.pid +logPath=$nginxPath/logs/daemon.log +while true;do + if [ ! -f $pidFile ]; then + echo "时间：`date '+%Y-%m-%d %T'` nginx进程不存在,开始启动nginx" >> $logPath + systemctl start nginx + fi +sleep 60 +done diff --git a/src/main/resources/scripts/redis_daemon.sh b/src/main/resources/scripts/redis_daemon.sh new file mode 100644 index 000000000..affddbc06 --- /dev/null +++ b/src/main/resources/scripts/redis_daemon.sh @@ -0,0 +1,11 @@ +#! /bin/bash +redisPath=/home/ceiec/redis/instances/6379 +pidFile=$redisPath/redis.pid +logPath=$redisPath/log/daemon.log +while true;do + if [ ! -f $pidFile ]; then + echo "时间：`date '+%Y-%m-%d %T'` redis进程不存在,开始启动redis" >> $logPath + systemctl start redis + fi +sleep 5 +done diff --git a/src/main/resources/scripts/servieDaemon.sh b/src/main/resources/scripts/servieDaemon.sh new file mode 100644 index 000000000..e94e4ef04 --- /dev/null +++ b/src/main/resources/scripts/servieDaemon.sh @@ -0,0 +1,22 @@ +#!/bin/bash +##tomcat安装位置 +tomcatPath=/home/ceiec/webTomcat +#tomcatPath=/opt/mesasoft/tomcat +##下面的不要改了,默认即可 +tomcatProcess=$tomcatPath/bin/bootstrap.jar +tomcatName=$tomcatPath +logPath=$tomcatPath/logs/daemon.log +echo $logPath +while true;do +count=`ps -ef|grep ${tomcatProcess} |grep -v grep` +if [ $? -ne 0 ] +then + echo "时间：`date '+%Y-%m-%d %T'` "$tomcatName"进程不存在,开始启动"$tomcatName >> $logPath + rm -rf $tomcatPath/work + nohup $tomcatPath/bin/startup.sh & +else +echo "时间：`date '+%Y-%m-%d %T'` "$tomcatName"进程存在" >> $logPath +fi +sleep 60 + +done diff --git a/src/main/resources/scripts/splitCatalinaOut.sh b/src/main/resources/scripts/splitCatalinaOut.sh new file mode 100644 index 000000000..938146095 --- /dev/null +++ b/src/main/resources/scripts/splitCatalinaOut.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# split catalina.out by day +cd `dirname $0` +d=`date +%Y%m%d` +d1=`date -d'1 day ago' +%Y%m%d` +d7=`date -d'7 day ago' +%Y%m%d` +d30=`date -d'30 day ago' +%Y%m%d` +cd ../logs/ + +cp catalina.out catalina.out.${d1} +echo "" > catalina.out +rm -rf catalina.out.${d30} diff --git a/src/main/resources/sql/20181212/add_data_dictionary.sql b/src/main/resources/sql/20181212/add_data_dictionary.sql index 8f7d27c76..90e0bf60d 100644 --- a/src/main/resources/sql/20181212/add_data_dictionary.sql +++ b/src/main/resources/sql/20181212/add_data_dictionary.sql @@ -7,8 +7,8 @@ INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_d INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3948', '4', 'Accounting-Request', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3949', '5', 'Accounting-Response', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3950', '11', 'Access-Challenge', '', '0', '1', '1', '149'); -INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3951', '12', 'Status-Server (experimental)', '', '0', '1', '1', '149'); -INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3952', '13', 'Status-Client (experimental)', '', '0', '1', '1', '149'); +INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3951', '12', 'Status-Server—Experimental', '', '0', '1', '1', '149'); +INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3952', '13', 'Status-Client—Experimental', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3953', '40', 'Disconnect-Request', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3954', '41', 'Disconnect-ACK', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3955', '42', 'Disconnect-NAK', '', '0', '1', '1', '149'); diff --git a/src/main/resources/sql/20181212/add_sys_menu.sql b/src/main/resources/sql/20181212/add_sys_menu.sql index 4c6717657..2a58d1a48 100644 --- a/src/main/resources/sql/20181212/add_sys_menu.sql +++ b/src/main/resources/sql/20181212/add_sys_menu.sql @@ -1,2 +1,2 @@ #添加 RADIUS协议日志 -INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1179', '1131', '0,1,152,1131,', 'radius_log', 'RADIUS协议日志', '80', '/log/ntc/radiusLogs', '', '', '1', '', '1', '2018-12-12 15:14:37', '1', '2018-12-12 15:14:37', '', '1', NULL, '0', '0', '650'); +INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1179', '1131', '0,1,152,1131,', 'radius_log', 'RADIUS协议日志', '80', '/log/ntc/radiusLogs', '', '', '1', '', '1', '2018-12-12 15:14:37', '1', '2018-12-12 15:14:37', '', '1', NULL, '0', '0', ''); diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag index 70d8fdf5d..778b1aeea 100644 --- a/src/main/webapp/WEB-INF/tags/sys/message.tag +++ b/src/main/webapp/WEB-INF/tags/sys/message.tag @@ -15,7 +15,19 @@ - -
- + + + + + + +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp index c3f252b37..427afdd8e 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp @@ -46,6 +46,7 @@ if(str.substr(str.length-1)== ','){ ids = str.substr(0,str.length-1); } + var canDel=true; var tip=''; if(serviceGroupIds.length>0){ @@ -60,7 +61,7 @@ } } }); - if(canDel){ + /* if(canDel){ // 不能删除包含ASN IP的 ASN组 $.ajax({ type:'post', url:'${ctx}/basics/policyGroup/ajaxHasAsnIPs', @@ -73,11 +74,35 @@ } } }); - } + } */ } if(canDel){ - window.location = url+"&ids="+ids; - }else{ + var added = ""; + if(serviceGroupIds.length != 0){ + added = ""; + } + top.$.jBox.confirm(""+added,"",function(v,h,f){ + if(v=="ok"){ + if(serviceGroupIds.length != 0){ + $.ajax({ + type:'post', + url:'${ctx}/basics/asn/ajaxDeleteAsnIp', + data:{"ids":serviceGroupIds.join(',')}, + async:false, + success:function(data,textStatus){ + if(textStatus == "success"){ + window.location = url+"&ids="+ids; + } + } + }); + }else{ + window.location = url+"&ids="+ids; + } + + } + },{buttonsFocus:1}); + top.$('.jbox-body .jbox-icon').css('top','55px'); + }else{ $.jBox.tip(tip); return false; } @@ -159,6 +184,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/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp index 46d42e1bb..486e096b6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp @@ -32,6 +32,7 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***",""); if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index 3ed94ecd7..1fa106d41 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -32,6 +32,7 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***",""); if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" 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/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp index b71b18710..c2075e789 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp @@ -32,13 +32,14 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***",""); if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" + $(this).attr("name").replace("isHexbin","cfgKeywords") + "']").html(""); flag = false; - } + } } }); if(flag){ @@ -53,6 +54,13 @@ $(function(){ errorContainer: "#messageBox", }); }); +function changeDistrict(obj){ + if("others"==obj.val()){ + obj.parent().siblings(".otherValue").prop("type","text"); + }else{ + obj.parent().siblings(".otherValue").prop("type","hidden"); + } +} @@ -441,4 +449,4 @@ $(function(){ - \ No newline at end of file + 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 0234908b5..97d53643d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -54,7 +54,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/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index 66511ee73..3bc0c341d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -313,6 +313,7 @@ function sampleFileValidate(fileType,fileName){ +
@@ -446,7 +447,11 @@ function sampleFileValidate(fileType,fileName){ class="fileNoteInfo" data-icon="" style="cursor:default">
+
+
+ +
<%--
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp index 8e4a83d2a..780317849 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp @@ -31,7 +31,7 @@ - ${fns:abbr(cfg.srcUrl,100)} + ${fns:abbr(cfg.srcUrl,40)}
@@ -42,7 +42,7 @@ - ${fn:substring(cfg.sampleUrl,0,100) } + ${fn:substring(cfg.sampleUrl,0,40) }
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/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 58c4926a9..882cb7229 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -123,7 +123,10 @@ checked + <%-- checked --%> + + checked + > 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/fileDigestLogSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp index 5f39147d8..c9f4f4033 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp @@ -2,6 +2,7 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> + @@ -30,8 +62,36 @@ <%-- --%> - +
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 63d212a5d..01193ded9 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -239,7 +239,7 @@ $(document).ready(function(){ <%-- --%> - + @@ -329,9 +329,9 @@ $(document).ready(function(){ - + --%> - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index aabbf3125..539bab8d8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -218,7 +218,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 eeda67563..455e042e8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -132,7 +132,7 @@ $(document).ready(function(){
- + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 908f42da7..cb9e6739a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -222,7 +222,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 2b37d96c9..3c1115c31 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -100,6 +100,9 @@

+
+ +
@@ -257,7 +260,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 86a655ba9..6a4be14c0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -240,7 +240,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index 7aea0ca63..154596b41 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -220,7 +220,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index 105cdd6f8..f25efe6fd 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -168,7 +168,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp index fb1f231e4..e216bb4d9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp @@ -196,7 +196,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp index f7cd91e0a..1efed0e62 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp @@ -196,7 +196,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index 7a5adfff5..807bf7e4e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -180,7 +180,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index 0e9f16aa6..eda7c9800 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -248,7 +248,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index 1287a4ff6..aaf653aed 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -185,7 +185,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 410552e5f..3a4024ae0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -183,7 +183,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 10ba938b4..437a5902a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -219,13 +219,13 @@ $(document).ready(function(){ - + <%-- --%> - + @@ -289,7 +289,7 @@ $(document).ready(function(){ ${log.url} - + --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index dbc9987b8..fab95bb6b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -182,7 +182,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index 5f3aa3cce..9ba1c97c8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -180,7 +180,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index 1e8e82000..e05ee6185 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -183,7 +183,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index 1f5cef1cf..1a8f1ec50 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -224,7 +224,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index 69bb5a7c6..f7767835d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -284,7 +284,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index bbadb1267..7efe1f91e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -224,7 +224,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index fb6b465ac..a97149c67 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -224,7 +224,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 5e64dfdee..0372e9e3a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -224,7 +224,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index 7aa1e929e..b1ca8421c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -224,7 +224,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 19529f08f..01b4c6b2f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -225,7 +225,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index 9c4a4d872..b8354feb3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -190,7 +190,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 07bdc8152..6cfc3834e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -223,17 +223,19 @@ $(document).ready(function(){ - + + - + + - <%-- --%> + - + @@ -293,12 +295,15 @@ $(document).ready(function(){ - + + - + + - + + - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index 90ea29a26..97d394efc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -182,7 +182,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index c38f32475..228e654c4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -222,7 +222,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index 71f98577d..4a8d96b63 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -177,7 +177,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp index d6f8e467b..3108c5480 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp @@ -58,7 +58,7 @@ " value="${page.orderBy}" callback="page();" />
-
+ <%--
-
+
--%>
@@ -193,7 +193,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index 749437256..034028d18 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -184,7 +184,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index cd26a440b..be098f2f9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -236,7 +236,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index 8326c0da4..50ab52e98 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -222,7 +222,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 @@ - +
+ <%-- ${log.labelAppSource} - ${fns:abbr(log.capIp, 42)} ${log.transProto } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index f68257ff7..0749ce63f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -185,7 +185,7 @@ $(document).ready(function(){ + <%-- @@ -303,7 +303,7 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - ${log.referer} ${log.calledAccount } ${log.callingNumber} ${log.calledNumber}${log.fromToStoreIp}${log.fromToStoreIp} ${log.fromToStoreUrl} ${log.toFromStoreIp}${log.toFromStoreUrl}${log.toFromStoreUrl} ${log.pid} + + @@ -312,7 +317,8 @@ $(document).ready(function(){ http://${fn:substring(log.logUri,0,20) } - ${log.level} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index b472d8aa3..e8f93d40a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -218,7 +218,7 @@ $(document).ready(function(){ SAN CN
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..38dbafaea 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 @@ - +

    区域名称区域编码区域类型经度纬度备注操作
    @@ -96,6 +96,7 @@ + @@ -143,6 +144,10 @@ + 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 @@
    - +
    ${log.remoteAddr} ${log.createBy} + + ${fns:abbr(log.params,100)}
    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 @@ <%--
  • 机构添加
    •  --%>
    - +
    diff --git a/src/main/webapp/online-help/proxy/cache_policy.html b/src/main/webapp/online-help/proxy/cache_policy.html index 57e840838..4a04d93ad 100644 --- a/src/main/webapp/online-help/proxy/cache_policy.html +++ b/src/main/webapp/online-help/proxy/cache_policy.html @@ -24,6 +24,9 @@ License: You must have a valid license purchased only from themeforest(the above + + + diff --git a/src/main/webapp/online-help/proxy/control_policy.html b/src/main/webapp/online-help/proxy/control_policy.html index 406bc1f95..965b6f3b8 100644 --- a/src/main/webapp/online-help/proxy/control_policy.html +++ b/src/main/webapp/online-help/proxy/control_policy.html @@ -24,6 +24,9 @@ License: You must have a valid license purchased only from themeforest(the above + + + diff --git a/src/main/webapp/online-help/proxy/intercept_policy.html b/src/main/webapp/online-help/proxy/intercept_policy.html index 084ee1f6a..473f6fda4 100644 --- a/src/main/webapp/online-help/proxy/intercept_policy.html +++ b/src/main/webapp/online-help/proxy/intercept_policy.html @@ -19,11 +19,12 @@ License: You must have a valid license purchased only from themeforest(the above online help + + - - + diff --git a/src/main/webapp/online-help/proxy/proxy_policy_object.html b/src/main/webapp/online-help/proxy/proxy_policy_object.html index efc20c84e..cfde1e5f8 100644 --- a/src/main/webapp/online-help/proxy/proxy_policy_object.html +++ b/src/main/webapp/online-help/proxy/proxy_policy_object.html @@ -24,6 +24,9 @@ License: You must have a valid license purchased only from themeforest(the above + + + @@ -60,7 +63,7 @@ License: You must have a valid license purchased only from themeforest(the above

    - 1.功能简介 + 1.Function Introduction

    diff --git a/src/main/webapp/static/PotPlayerSetup64.exe b/src/main/webapp/static/PotPlayerSetup64.exe new file mode 100644 index 000000000..c6041700c Binary files /dev/null and b/src/main/webapp/static/PotPlayerSetup64.exe differ diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js index af2f41f77..e24c3c119 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js @@ -1016,18 +1016,18 @@ jQuery.validator.addMethod("ipMaskSole",function(value,element) { // DNS阻断无策略校验 jQuery.validator.addMethod("noStrategyCheck",function(value,element) { var flag = true; - if(value == 0){ + //if(value == 0){ var ctx = $(element).attr("ctx"); var url = ctx+"/cfg/dnsIp/dnsNoStrategyCheck"; $.ajax({ type:'post', async:false, url: url, - data:{"dnsStrategyId":0}, + data:{"dnsStrategyId":value}, success:function(data){ flag = data; } }); - } + //} return flag; }); \ No newline at end of file diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js index 413347497..a870fa3a8 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js @@ -81,6 +81,6 @@ areaUnique:"Area already exists.", config_sync_tip:"The system is being maintained and temporarily inaccessible.", ipMaskSole:"IP already exists.", - noStrategyCheck:"No effective spoofing IP configuration under default group." + noStrategyCheck:"No effective spoofing IP configuration" }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js index 970d3b696..272545420 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js @@ -81,6 +81,6 @@ areaUnique:"Регион уже существует.", config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.", ipMaskSole:"IP уже существует.", - noStrategyCheck:"No effective spoofing IP configuration under default group." + noStrategyCheck:"No effective spoofing IP configuration" }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js index 5297909d7..d2061b7fc 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js @@ -81,6 +81,6 @@ areaUnique:"该区域已存在", config_sync_tip:"系统正在维护中，暂时不可访问！", ipMaskSole:"IP已存在", - noStrategyCheck:"缺省组下无有效的欺骗IP配置" + noStrategyCheck:"策略组下无有效的欺骗IP配置" }); }(jQuery)); diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index c8f1f47a6..71265bccd 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -67,7 +67,7 @@ $(function(){ setIsHexBin(this); }); $("a[name=viewLogInfo]>i").on("click",function(){ - /* + var url=$(this).parents("a").attr("url"); var compileId=$(this).parents("a").attr("compileId"); var pzhtml=""; @@ -85,10 +85,12 @@ $(function(){ htmls+="
    "; htmls = htmls+data; subTab=subTab+htmls; - pzhtml=subTab; + //pzhtml=subTab.replace('col-md-4','col-md-8'); + var reg = new RegExp( 'col-md-4' , "g" ) + pzhtml = subTab.replace( reg , 'col-md-6' ); } }); - }*/ + } var html = "
    "; $(this).parents("tr").find("td").each(function(index,element){ if(index >0){ @@ -112,10 +114,10 @@ $(function(){ html+="
    "; } }) - /* + if(pzhtml!=null && pzhtml!=""){ html+="
    "; - html+="
    " + html+="
    " html+=pzhtml; html +='