(1)域名页面keyword字段说明改为域名
(2)加入域名验证方法domainCheck,目前没有对现在已经存在的顶级域名进行校验,主要是顶级域名较多,枚举起来困难。
This commit is contained in:
@@ -21,7 +21,6 @@ import com.nis.domain.configuration.AppIpCfg;
|
|||||||
import com.nis.domain.configuration.AppPolicyCfg;
|
import com.nis.domain.configuration.AppPolicyCfg;
|
||||||
import com.nis.domain.specific.SpecificServiceCfg;
|
import com.nis.domain.specific.SpecificServiceCfg;
|
||||||
import com.nis.exceptions.MaatConvertException;
|
import com.nis.exceptions.MaatConvertException;
|
||||||
import com.nis.util.Constants;
|
|
||||||
import com.nis.web.controller.BaseController;
|
import com.nis.web.controller.BaseController;
|
||||||
import com.nis.web.security.UserUtils;
|
import com.nis.web.security.UserUtils;
|
||||||
|
|
||||||
|
|||||||
@@ -279,6 +279,7 @@ monitor_white_list=monitor white list
|
|||||||
block_monitor_white_list=block monitor white list
|
block_monitor_white_list=block monitor white list
|
||||||
grey_list=grey list
|
grey_list=grey list
|
||||||
type=type
|
type=type
|
||||||
|
domain_name=domain name
|
||||||
single_domain=single domain
|
single_domain=single domain
|
||||||
multi_domain=multi domain
|
multi_domain=multi domain
|
||||||
special_service=special service
|
special_service=special service
|
||||||
|
|||||||
@@ -266,6 +266,7 @@ monitor_white_list=monitor white list
|
|||||||
block_monitor_white_list=block monitor white list
|
block_monitor_white_list=block monitor white list
|
||||||
grey_list=grey list
|
grey_list=grey list
|
||||||
type=type
|
type=type
|
||||||
|
domain_name=domain name
|
||||||
single_domain=single domain
|
single_domain=single domain
|
||||||
multi_domain=multi domain
|
multi_domain=multi domain
|
||||||
special_service=special service
|
special_service=special service
|
||||||
|
|||||||
@@ -277,6 +277,7 @@ monitor_white_list=\u76D1\u6D4B\u767D\u540D\u5355
|
|||||||
block_monitor_white_list=\u5C01\u5835\u76D1\u6D4B\u767D\u540D\u5355
|
block_monitor_white_list=\u5C01\u5835\u76D1\u6D4B\u767D\u540D\u5355
|
||||||
grey_list=\u7070\u540D\u5355
|
grey_list=\u7070\u540D\u5355
|
||||||
type=\u7C7B\u578B
|
type=\u7C7B\u578B
|
||||||
|
domain_name=\u57DF\u540D
|
||||||
single_domain=\u5355\u57DF
|
single_domain=\u5355\u57DF
|
||||||
multi_domain=\u591A\u57DF
|
multi_domain=\u591A\u57DF
|
||||||
special_service=\u7279\u5B9A\u670D\u52A1
|
special_service=\u7279\u5B9A\u670D\u52A1
|
||||||
|
|||||||
@@ -153,9 +153,9 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="form-group ">
|
<div class="form-group ">
|
||||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
|
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="domain_name"/></label>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<input class="form-control required" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
<input class="form-control required url" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
||||||
</div>
|
</div>
|
||||||
<div for="cfgKeywords"></div>
|
<div for="cfgKeywords"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -203,7 +203,7 @@
|
|||||||
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
||||||
<%-- <th><spring:message code="seq"/></th> --%>
|
<%-- <th><spring:message code="seq"/></th> --%>
|
||||||
<th><spring:message code="config_describe"/></th>
|
<th><spring:message code="config_describe"/></th>
|
||||||
<th><spring:message code="key_word"/></th>
|
<th><spring:message code="domain_name"/></th>
|
||||||
<th><spring:message code="block_type"/></th>
|
<th><spring:message code="block_type"/></th>
|
||||||
<th><spring:message code="expression_type"/></th>
|
<th><spring:message code="expression_type"/></th>
|
||||||
<th><spring:message code="match_method"/></th>
|
<th><spring:message code="match_method"/></th>
|
||||||
|
|||||||
@@ -124,9 +124,9 @@ $(function(){
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="form-group ">
|
<div class="form-group ">
|
||||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
|
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="domain_name"/></label>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<input class="form-control required" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
<input class="form-control required domainCheck" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
||||||
</div>
|
</div>
|
||||||
<div for="cfgKeywords"></div>
|
<div for="cfgKeywords"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -199,7 +199,7 @@
|
|||||||
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
||||||
<%-- <th><spring:message code="seq"/></th> --%>
|
<%-- <th><spring:message code="seq"/></th> --%>
|
||||||
<th><spring:message code="config_describe"/></th>
|
<th><spring:message code="config_describe"/></th>
|
||||||
<th><spring:message code="key_word"/></th>
|
<th><spring:message code="domain_name"/></th>
|
||||||
<th><spring:message code="block_type"/></th>
|
<th><spring:message code="block_type"/></th>
|
||||||
<th><spring:message code="valid_identifier"/></th>
|
<th><spring:message code="valid_identifier"/></th>
|
||||||
<th><spring:message code="is_audit"/></th>
|
<th><spring:message code="is_audit"/></th>
|
||||||
|
|||||||
@@ -165,6 +165,13 @@ jQuery.validator.addMethod("notStartZero",function(value, element) {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}, "请填写正确的数值");
|
}, "请填写正确的数值");
|
||||||
|
jQuery.validator.addMethod("domainCheck",function(value, element) {
|
||||||
|
var regexp=/^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$/;
|
||||||
|
if(this.optional(element)||regexp.test(value)){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
//ip地址校验
|
//ip地址校验
|
||||||
jQuery.validator.addMethod("ipCheck",function(value, element) {
|
jQuery.validator.addMethod("ipCheck",function(value, element) {
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
ip_subnet: "Subnet",
|
ip_subnet: "Subnet",
|
||||||
ip_range: "ip Range",
|
ip_range: "ip Range",
|
||||||
timeout:"timeout",
|
timeout:"timeout",
|
||||||
areaIpPrefix:"Forbiden value: "
|
areaIpPrefix:"Forbiden value: ",
|
||||||
|
domainCheck:"Please enter a valid domain."
|
||||||
});
|
});
|
||||||
}(jQuery));
|
}(jQuery));
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
ip_subnet: "Subnet",
|
ip_subnet: "Subnet",
|
||||||
ip_range: "ip Range",
|
ip_range: "ip Range",
|
||||||
timeout:"timeout",
|
timeout:"timeout",
|
||||||
areaIpPrefix:"Forbiden value: "
|
areaIpPrefix:"Forbiden value: ",
|
||||||
|
domainCheck:"Please enter a valid domain."
|
||||||
});
|
});
|
||||||
}(jQuery));
|
}(jQuery));
|
||||||
@@ -51,6 +51,7 @@
|
|||||||
ip_subnet: "Subnet",
|
ip_subnet: "Subnet",
|
||||||
ip_range: "ip Range",
|
ip_range: "ip Range",
|
||||||
timeout:"超时",
|
timeout:"超时",
|
||||||
areaIpPrefix:"禁止使用的值: "
|
areaIpPrefix:"禁止使用的值: ",
|
||||||
|
domainCheck:"请输入有效的域名"
|
||||||
});
|
});
|
||||||
}(jQuery));
|
}(jQuery));
|
||||||
|
|||||||
Reference in New Issue
Block a user