diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index e07445cf0..b90f86caf 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -222,9 +222,10 @@ public class HttpClientUtil { // result = EntityUtils.toString(response.getEntity()); //调用处理数据方法 result = galaxyMessageFormat(result); - logger.debug("获取消息成功,相应内容如下: " + result); + logger.info("获取消息成功,相应内容如下: " + result); } else { + logger.error("获取消息失败,相应内容如下: " + result); throw new MaatConvertException(status+""); } } /*catch (SocketTimeoutException e) { @@ -237,8 +238,9 @@ public class HttpClientUtil { throw new MaatConvertException(requestContext.getMessage("request_service_failed") + ":timeout"); }*/ catch (Exception e) { e.printStackTrace(); + logger.error("获取消息失败,相应内容如下: " + result); logger.error("获取消息失败 ", e); - throw new MaatConvertException(requestContext.getMessage("request_service_failed")); + throw new MaatConvertException(":"); } /*finally { try { if (response != null) { diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 94c69a02e..537c83f8a 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -271,6 +271,8 @@ public class BaseController { messages="data_format_error"; }else if("500".equals(status)){ messages="server_internal_error"; + }else if(status.indexOf("request_service_failed")!=-1){ + messages="server_internal_error"; } } model.addAttribute("message",messages); diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index 1e27a9f50..331d08418 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -38,7 +38,7 @@ public class DnsIpCfgController extends BaseController { ,RedirectAttributes redirectAttributes){ Page page = dnsIpCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/dnsIpCfgList"; } @RequestMapping(value = {"/form"}) diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index 4e45f7c12..de7f9deed 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -89,7 +89,7 @@ public class DnsResStrategyController extends BaseController { //查询时left join policyGroup Page page = dnsResStrategyService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/maintenance/dnsResStrategy/list"; } 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 4a20956ed..735e5e833 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 @@ -76,7 +76,7 @@ public class IpMultiplexPoolCfgController extends BaseController { //查询时left join policyGroup Page page = ipMultiplexPoolCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/maintenance/ipMultiplexPool/list"; } diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index 2437f7b38..ade797550 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -34,7 +34,7 @@ public class DdosCfgController extends BaseController { public String list(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")DdosIpCfg entity){ Page page = ddosCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/ddosIpCfgList"; } @RequestMapping(value = {"/form"}) diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java index 40911eb46..13e585115 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java @@ -36,6 +36,7 @@ import com.nis.web.controller.configuration.CommonController; */ @Controller ///manipulation/ratelimit/domain/list?cfgName=domain_ratelimit @RequestMapping("${adminPath}/manipulation/ratelimit") +@Deprecated public class RatelimitController extends CommonController { @RequestMapping(value = {"/ip/list"}) // @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:confirm"},logical=Logical.OR) diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java index 4ae935ff5..7e34dec44 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AsnPolicyCfgController.java @@ -28,7 +28,7 @@ public class AsnPolicyCfgController extends BaseController { ,RedirectAttributes redirectAttributes){ Page page = asnPolicyCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/asnPolicyCfgList"; } @RequestMapping(value = {"/form"}) 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 9bbb01534..df71e617f 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 @@ -118,7 +118,7 @@ public class AvController extends BaseController { try{ // if(srcFile!=null && sampleFile!=null && // srcFile.getSize()>0 && sampleFile.getSize()>0){ - if(srcFile!=null && srcFile.getSize()>0){ + if(srcFile!=null && srcFile.getSize()>0 && entity!=null){ String sep = System.getProperty("file.separator"); String srcFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"srcFile";//源文件保存路径 String sampleFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"sampleFile";//样例文件保存路径 @@ -159,7 +159,8 @@ public class AvController extends BaseController { // entity.setSampleMd5(sampleMd5); } - avCfgService.saveOrUpdateAvFileSample(entity); + avCfgService.saveOrUpdateAvFileSample(entity, srcFile); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("文件上传失败",e); @@ -178,6 +179,7 @@ public class AvController extends BaseController { public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){ try{ avCfgService.saveOrUpdateAvSignSample(entity); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("saveAudioSignSample failed",e); e.printStackTrace(); @@ -191,8 +193,9 @@ public class AvController extends BaseController { } //修改文件样例配置状态 @RequestMapping(value = {"/sample/updateAvFileSampleValid"}) - public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes){ avCfgService.updateAvFileSampleValid(isAudit,isValid,ids); + addMessage(redirectAttributes,"delete_failed"); return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId; } //修改文件样例配置审核状态 diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java index 5ad5837db..251a8719d 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java @@ -35,6 +35,7 @@ import com.nis.web.controller.configuration.CommonController; */ @Controller @RequestMapping("${adminPath}/proxy/control") +@Deprecated public class ControlController extends CommonController { @RequestMapping(value = {"/ip/list"}) // @RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR) 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 428417107..801c3744e 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 @@ -13,22 +13,13 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; -import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; -import com.nis.domain.configuration.ComplexkeywordCfg; -import com.nis.domain.configuration.DnsResStrategy; -import com.nis.domain.configuration.HttpUrlCfg; -import com.nis.domain.configuration.InterceptPktBin; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.PxyObjKeyring; -import com.nis.domain.configuration.template.IpAddrTemplate; import com.nis.exceptions.MaatConvertException; import com.nis.web.controller.configuration.CommonController; import com.nis.web.security.UserUtils; 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 6ebeb7d02..9fc8da615 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 @@ -163,7 +163,7 @@ public class PxyObjKeyringController extends BaseController { //查询时left join policyGroup Page page = pxyObjKeyringService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/intercept/strateagy/list"; } diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index 26766af66..819d30360 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -16,6 +16,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import com.nis.domain.Page; import com.nis.domain.configuration.AvFileSampleCfg; @@ -77,7 +78,7 @@ public class AvCfgService extends BaseService{ List list = avCfgDao.getAvSignSampleList(entity); return list; } - public void saveOrUpdateAvFileSample(AvFileSampleCfg entity){ + public void saveOrUpdateAvFileSample(AvFileSampleCfg entity,MultipartFile srcFile){ //设置区域运营商信息 setAreaEffectiveIds(entity); if(entity.getCfgId()==null){ @@ -116,7 +117,7 @@ public class AvCfgService extends BaseService{ entity.setEditTime(new Date()); entity.setIsValid(0); entity.setIsAudit(0); - if(!oldEntity.getSrcMd5().equals(entity.getSrcMd5())){ + if(null!=srcFile){ //删除旧的文件 FileUtils.deleteFile(oldEntity.getSrcPath()); FileUtils.deleteFile(oldEntity.getSamplePath()); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4877442a2..ff7a35546 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1145,4 +1145,5 @@ dest_country=Dest IP Country MM_SPEAKER_RECOGNIZATION=Speaker Recognization MM_LOGO_DETECTION=Logo Detection MM_FACE_RECOGNIZATION=Face Recognization -preset=Preset \ No newline at end of file +preset=Preset +ip_must_select=IP Configuration must select \ 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 2c5d44e22..c67825cec 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1136,4 +1136,5 @@ dest_country=\u0421\u0442\u0440\u0430\u043D\u0430 \u0446\u0435\u043B\u0435\u0432 MM_SPEAKER_RECOGNIZATION=Speaker Recognization MM_LOGO_DETECTION=Logo Detection MM_FACE_RECOGNIZATION=Face Recognization -preset=Preset \ No newline at end of file +preset=Preset +ip_must_select=IP配置必选 \ 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 29181b949..900df1bd7 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1143,4 +1143,5 @@ dest_country=\u76EE\u7684IP\u6240\u5C5E\u56FD\u5BB6 MM_SPEAKER_RECOGNIZATION=\u8BF4\u8BDD\u4EBA\u8BC6\u522B MM_LOGO_DETECTION=\u53F0\u6807\u8BC6\u522B MM_FACE_RECOGNIZATION=\u4EBA\u8138\u8BC6\u522B -preset=\u9884\u7F6E \ No newline at end of file +preset=\u9884\u7F6E +ip_must_select=IP\u914D\u7F6E\u5FC5\u9009 \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 585e8d610..530f4687a 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -358,8 +358,8 @@ user_region_placeholder=0 #\u7528\u6237\u81EA\u5B9A\u4E49\u57DF\u5206\u9694\u7B26 user_region_split=; #IP\u76F8\u5173\u9A8C\u8BC1\u6B63\u5219 -ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|[1-2][0-9]|[0-9])$ -ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/(0|2|4|8|16|32|64|128)$ +ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[6-9]|2[0-9])$ +ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/(128)$ ipv4_ip_range_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ ipv6_ip_range_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$ ipv4_ip_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$ diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index ff15630b2..49e0eb98b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -269,8 +269,8 @@ - - + + @@ -283,7 +283,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index 828bf6cb9..bfc75fc18 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -269,8 +269,8 @@ - - + + @@ -283,7 +283,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp index 0ece44f29..bf7580afa 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -269,8 +269,8 @@ - - + + @@ -284,7 +284,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index cb27b1b33..637dde070 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -270,8 +270,8 @@ - - + + @@ -285,7 +285,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index aba8cf4c3..55a07eb8b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -274,8 +274,8 @@ - - + + IP <%-- @@ -289,7 +289,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 24dfd8847..b8005a74b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -18,6 +18,9 @@ $(function(){ }else{ $(".subscribeId").hide(); } + if($(this).val()==1){ + $(".ipPortAdd").click(); + } }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -46,6 +49,10 @@ $(function(){ top.$.jBox.tip("", ""); return; } */ + if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){ + top.$.jBox.tip("", ""); + return false; + } $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){ if($(this).val()==''){ $(this).parents(".form-group").find( @@ -330,7 +337,7 @@ var delContent = function(contentClassName, addBtnClassName) { diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 9d272d8be..4150fc6de 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -146,11 +146,20 @@ + +
+ + + + + + +
@@ -315,8 +324,8 @@ - - + + <%-- @@ -327,7 +336,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp index 44c67c10a..550cb5533 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -269,8 +269,8 @@ - - + + @@ -284,7 +284,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp index 7d3a09d9f..59a5ab851 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp @@ -267,8 +267,8 @@ - - + + @@ -283,7 +283,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 7ca8af3a7..27dd17e90 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -266,8 +266,8 @@ - - + + @@ -282,7 +282,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp index 1757914de..90cf18e20 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp @@ -136,11 +136,20 @@ --%> + +
+ + + + + + +
@@ -243,8 +252,8 @@ - - + + <%-- @@ -253,7 +262,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 fa82e2334..f2b4195aa 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 @@ -278,8 +278,8 @@ <%-- --%> - - + + @@ -296,7 +296,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 fd6a2b77c..3352b3b76 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 @@ -274,8 +274,8 @@ - - + + @@ -290,7 +290,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index 3754bdf64..a3d92cc17 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -268,8 +268,8 @@ - - + + <%-- --%> @@ -279,7 +279,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index 9360cc261..454d7c22c 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 @@ -278,8 +278,8 @@ <%-- --%> - - + + @@ -296,7 +296,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 1520a9e4d..986c18178 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 @@ -276,8 +276,8 @@ <%-- --%> - - + + @@ -292,7 +292,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 0cf7b5100..15c0a1754 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -278,17 +278,17 @@ <%-- --%> - + - + - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp index cb8c73214..039ef8679 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp @@ -628,8 +628,8 @@ - - + + @@ -637,7 +637,7 @@ - + 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 674d81499..fe3a72aa0 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 @@ -642,8 +642,8 @@ - - + + @@ -651,7 +651,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp index 74bf2b1ae..984d5978e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp @@ -24,6 +24,9 @@ $(function(){ }else{ $("#ratelimit").hide(); } + if($(this).val()==1){ + $(".ipPortAdd").click(); + } }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -51,6 +54,10 @@ $(function(){ } */ var flag = true; + if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){ + top.$.jBox.tip("", ""); + return false; + } $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){ if($(this).val()==''){ @@ -299,7 +306,7 @@ var delContent = function(contentClassName, addBtnClassName) { diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index a240e90ed..5ab1b4b8f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -149,13 +149,21 @@ + - +
+ + + + + + +
@@ -319,8 +327,8 @@ - - + + <%-- --%> <%-- --%> @@ -331,7 +339,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 5628d668c..e5dcf9850 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -101,12 +101,20 @@ +
- +
+ + + + + + +
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 a852f8786..00d4afcf9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -41,11 +41,6 @@ - - - - -
<%@include file="/WEB-INF/include/excel/importIp.jsp" %> @@ -164,12 +159,20 @@ - - -
- - - + + + +
+ + +
+ + + + + + +
@@ -335,42 +338,26 @@ <%-- --%> - + + - - - - - - - - - - - - - - - - - - + <%-- --%> @@ -387,7 +374,8 @@ <%-- ${status.index+1 } --%> - ${cfg.cfgDesc } + ${cfg.compileId } + ${cfg.cfgDesc } @@ -397,16 +385,8 @@ - - ${fns:abbr(cfg.srcIpAddress, 42)} - ${cfg.srcPort } - ${fns:abbr(cfg.destIpAddress, 42)} - ${cfg.destPort } - - - ${fns:abbr(cfg.srcIpAddress, 42)} - ${cfg.srcPort } - + ${fns:abbr(cfg.srcIpAddress, 42)} + ${cfg.srcPort } @@ -418,56 +398,22 @@ - - - - - - - - - - - - - - - - - - - - - - - ${cfg.groupName } - 0% ${cfg.ratelimit}% - - - - - - - - - ${cfg.userRegion2 } - ${cfg.requestName } diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 3b6eea6a1..c1e039950 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -103,11 +103,20 @@ +
+
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 07a213366..60fef2c07 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -110,11 +110,20 @@ + +
+ + + + + + +
@@ -280,7 +289,8 @@ <%-- --%> - + + <%-- --%> @@ -296,7 +306,7 @@ - + @@ -312,6 +322,7 @@ + ${cfg.compileId } ${cfg.cfgDesc } diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 33cd98ceb..41bd359f0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -104,11 +104,20 @@ <%-- --%> + +
+ + + + + + +
@@ -275,7 +284,8 @@ <%-- --%> - + + @@ -287,7 +297,7 @@ - + <%-- --%> @@ -303,6 +313,7 @@ + ${cfg.compileId } ${cfg.cfgDesc } ${cfg.dnsStrategyName } diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index b22f7b45e..320a4db4d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -150,12 +150,20 @@ + - +
+ + + + + + +
@@ -319,8 +327,8 @@ - - + + <%-- --%> @@ -331,7 +339,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 9e51d3536..0bb068168 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -135,12 +135,20 @@ +
- +
+ + + + + + +
@@ -305,7 +313,8 @@ - + + @@ -317,7 +326,7 @@ <%-- --%> - + <%-- --%> @@ -335,6 +344,7 @@ + ${indexCfg.compileId } ${indexCfg.cfgDesc } --%> +
- +
+ + + + + + +
@@ -310,8 +318,8 @@ - - + + @@ -319,7 +327,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 212d8c044..58923378b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -132,12 +132,20 @@ +
- +
+ + + + + + +
@@ -301,8 +309,8 @@ - - + + @@ -310,7 +318,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 447163f3e..ca78203b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -143,11 +143,20 @@ --%> +
+
+ + + + + + +
@@ -312,8 +321,8 @@ - - + + <%-- --%> @@ -329,7 +338,7 @@ - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index 019aff7df..35a3a28c0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -85,12 +85,20 @@ + - +
+ + + + + + +
@@ -256,7 +264,8 @@ <%-- --%> - + + @@ -271,7 +280,7 @@ - + @@ -287,6 +296,7 @@ + ${cfg.compileId } ${cfg.cfgDesc } diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp index 6efdd9639..5da1f5c12 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -100,11 +100,20 @@ - - -
- - + + + + + + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index 0ffd04076..5cfeb9b5f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -132,12 +132,20 @@ + - +
+ + + + + + +
@@ -301,8 +309,8 @@ - - + + @@ -310,7 +318,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index 1dc574b55..e86d65e15 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -137,11 +137,20 @@ --%> +
+
+ + + + + + +
@@ -306,8 +315,8 @@ - - + + @@ -315,7 +324,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index a54e8c5fc..5211daa16 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -89,11 +89,20 @@ + +
+ + + + + + +
@@ -260,8 +269,8 @@ <%-- --%> - - + + @@ -273,7 +282,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 965f2736a..e011e43e5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -90,11 +90,20 @@ + +
+ + + + + + +
@@ -260,7 +269,8 @@ <%-- --%> - + + @@ -274,7 +284,7 @@ - + @@ -288,6 +298,7 @@ + ${cfg.compileId}
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp index 5ad894e0a..dd23dee2a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp @@ -142,10 +142,20 @@
- - - - + + + + + + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index ed8b9064e..d61b7ef92 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -138,11 +138,20 @@ --%> +
+
+ + + + + + +
@@ -308,8 +317,8 @@ - - + + @@ -317,7 +326,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index 912ca138b..16d3e5116 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -138,11 +138,20 @@ --%> + +
+ + + + + + +
@@ -307,8 +316,8 @@ - - + + @@ -316,7 +325,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index b29dfee8d..99fbdd0c6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -326,12 +326,20 @@ --%> + - +
+ + + + + + +
@@ -502,8 +510,8 @@ - - + + @@ -526,7 +534,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp index 18414d12c..7220b04ef 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp @@ -86,11 +86,20 @@ +
+
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp index 171ddb21d..3e55f3e59 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp @@ -87,11 +87,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp index 14e954e75..0181c3649 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp @@ -94,9 +94,20 @@
+ +
+ +
+ + + + + + +
@@ -267,7 +278,8 @@ - + + <%-- --%> @@ -275,7 +287,7 @@ - + @@ -291,6 +303,7 @@ + ${indexCfg.compileId } ${indexCfg.fileDesc } ${indexCfg.contentType } ${indexCfg.contentLength } diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 712dc5d41..4b8dc9ba7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -77,10 +77,20 @@ - -
- - + + + + + + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp index 5d43fb58b..0072647ec 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp @@ -102,11 +102,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index cfd8418fc..6cf1e7dda 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -136,11 +136,20 @@ --%> + +
+ + + + + + +
@@ -305,8 +314,8 @@ - - + + @@ -315,7 +324,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index ade307040..e5b1887c8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -294,11 +294,20 @@ --%> + +
+ + + + + + +
@@ -463,8 +472,8 @@ - - + + @@ -472,7 +481,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 1bbba778a..7dcc4b5d8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -136,11 +136,20 @@ --%> + +
+ + + + + + +
@@ -305,8 +314,8 @@ - - + + @@ -314,7 +323,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 532aeefd2..455001410 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -136,11 +136,20 @@ --%> + +
+ + + + + + +
@@ -305,8 +314,8 @@ - - + + <%-- @@ -314,7 +323,7 @@ --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index 3451c6cd6..d3078f861 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -136,11 +136,20 @@ --%> + +
+ + + + + + +
@@ -305,8 +314,8 @@ - - + + <%-- @@ -314,7 +323,7 @@ --%> - + <%-- --%> 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 0966d22b3..a3c1ffc67 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 @@ -212,8 +212,8 @@ jQuery.validator.addMethod("httpCheck",function(value, element) { //ip地址校验 jQuery.validator.addMethod("ipCheck",function(value, element) { - var ipv4_ip_subnet_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\/(3[0-2]|[1-2][0-9]|[0-9])$/; - var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/(0|2|4|8|16|32|64|128)$/; + var ipv4_ip_subnet_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\/(3[0-2]|1[6-9]|2[0-9])$/; + var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/(128)$/; var ipv4_ip_range_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)-(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/; var ipv6_ip_range_regexp= /^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))$/; var ipv4_ip_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/; @@ -332,7 +332,8 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(!ipv6_ip_regexp.test(ipMaskArr[0])){ $.validator.messages.ipCheck=$.validator.messages.ipPart; return false; - }else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ + //}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ + }else if(!/^(128)$/.test(ipMaskArr[1])){ $.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart; return false; } else{ @@ -446,7 +447,8 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(!ipv6_ip_regexp.test(ipMaskArr[0])){ $.validator.messages.ipCheck=$.validator.messages.ipPart; return false; - }else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ + //}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ + }else if(!/^(128)$/.test(ipMaskArr[1])){ $.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart; return false; } else{ @@ -503,7 +505,8 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(!ipv6_ip_regexp.test(ipMaskArr[0])){ $.validator.messages.ipCheck=$.validator.messages.ipPart; return false; - }else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ + //}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ + }else if(!/^(128)$/.test(ipMaskArr[1])){ $.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart; return false; } else{ 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 04cd92a2a..8887f61cc 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 @@ -26,8 +26,10 @@ ipCheck:"Please enter a correct IP address", ipMask:"Please enter a correct IP/mask", ipPart:"Invalid IP part", - ipv6MaskPart:"Mask must be exponent of 2,not greater than 128", - ipMaskRange:"IP mask must between 0 and 32", + //ipv6MaskPart:"Mask must be exponent of 2,not greater than 128", + ipv6MaskPart:"Mask must be 128", + //ipMaskRange:"IP mask must between 0 and 32", + ipMaskRange:"IP mask must between 16 and 32", srcIpNotEqDestIp:"Sourse IP ", destIpNotEqDestIp:" and destination IP ", IpNotEqDestIp:" can't be the same", @@ -69,6 +71,7 @@ failed:"Failed", go_back:"Go Back Policies", log_5_minutes:"Log Five Minutes' Amount", - log_1_hour:"Log One Hour's Amount" + log_1_hour:"Log One Hour's Amount", + input:"Please Enter " }); }(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 2386c0de0..6cf457893 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 @@ -26,8 +26,10 @@ ipCheck:"Заполните правильный IP-адрес", ipMask:"Заполните правильный IP-адрес / маска", ipPart:"Ошибка формата части IP", - ipv6MaskPart:"Mаска-показатель степени 2, небольше 128", - ipMaskRange:"Маска IP между 0 и 32", + //ipv6MaskPart:"Mаска-показатель степени 2, небольше 128", + ipv6MaskPart:"掩码必须为128", + //ipMaskRange:"Маска IP между 0 и 32", + ipMaskRange:"Маска IP между 16 и 32", srcIpNotEqDestIp:"IP-адрес источника ", destIpNotEqDestIp:" с IP-адресом назначения", IpNotEqDestIp:" не может быть одинаковым", 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 1706c6575..5c9ea8ada 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 @@ -26,8 +26,10 @@ ipCheck:"请填写正确的IP地址", ipMask:"请填写正确的IP地址/掩码", ipPart:"IP部分格式错误", - ipv6MaskPart:"掩码为不大于128的2的指数幂", - ipMaskRange:"IP掩码介于0到32", + //ipv6MaskPart:"掩码为不大于128的2的指数幂", + ipv6MaskPart:"掩码必须为128", + //ipMaskRange:"IP掩码介于0到32", + ipMaskRange:"IP掩码介于16到32", srcIpNotEqDestIp:"源IP ", destIpNotEqDestIp:" 与目的IP ", IpNotEqDestIp:" 不能相同", @@ -69,6 +71,7 @@ failed:"获取失败", go_back:"返回配置界面", log_5_minutes:"5分钟日志量", - log_1_hour:"1小时日志量" + log_1_hour:"1小时日志量", + input:"请输入 " }); }(jQuery)); diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 1c9c0d17a..5d22efa62 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -464,7 +464,54 @@ $(function(){ } } - }) + }); + // 初始 + if($("#seltype").val() == "action"){ + $("#intype").hide();// 隐藏输入框 + if($("#actionSelect").find("option").length < 3){ + $("#actionSelect").find("option[value='']").remove(); + } + }else{ + $("#actionSelect").selectpicker("hide");// 隐藏下拉框 + } + // 改变 + $("#seltype").on("change",function() { + if($(this).val() == "action"){ + if($("#actionSelect").find("option").length < 3){ + $("#actionSelect").find("option[value='']").remove(); + } + + $("#intype").hide(); // 隐藏输入框 + $("#intype").val("");// 清空input条件 + $("#actionSelect").find("option").removeAttr("selected",false); + $("#actionSelect").selectpicker("refresh"); + $("#actionSelect").selectpicker("show");// 显示下拉框 + }else{ + $("#intype").show(); // 显示输入框 + $("#intype").val("");// 清空input条件 + $("#actionSelect").find("option:first").attr("selected",true);// 清空action条件 + $("#actionSelect").selectpicker("hide");// 隐藏下拉框 + } + }); + + // 重置操作(增加) + $("#resetBtn").on("click",function(){ + // action查询条件放最上面的情况 + if($("#seltype").find("option:first").val() == "action"){ + $("#intype").hide(); + $("#actionSelect").selectpicker("show"); + return false; + } + if($("#seltype").val() == "action"){ + $("#intype").show(); + $("#intype").attr("placeholder",$.validator.messages.input+$("#seltype").find("option:first").text()); + $("#actionSelect").selectpicker("hide"); + }else{ + $("#intype").attr("placeholder",$.validator.messages.input+$("#seltype").find("option:first").text()); + } + + }); + }); window.onload=function(){ $("span[id^=open]").click(function(){ @@ -1139,7 +1186,9 @@ var areaControlInit=function(){ } //查询 var page=function(n,s){ - $("#intype").attr("name",$("#seltype").val()); + if($("#intype").val() != null && $("#intype").val() != ""){ + $("#intype").attr("name",$("#seltype").val()); + } $("#pageNo").val(n); $("#pageSize").val(s); $("#searchForm").submit();