diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java
index a186b347e..1dca19645 100644
--- a/src/main/java/com/nis/util/ConfigConvertUtil.java
+++ b/src/main/java/com/nis/util/ConfigConvertUtil.java
@@ -833,6 +833,8 @@ public class ConfigConvertUtil {
return gsonToJson(userRegionMap);
}else if(serviceId.equals(592)){
return "{}";
+ }else if(serviceId.equals(18)){
+ return "DNS_STRATEGY=0";
}else{
return "0";
}
diff --git a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
index 2daa16a66..c2e909406 100644
--- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
+++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
@@ -113,6 +113,12 @@ public class ObjectGroupService extends BaseService {
}else if(entity.getAction().equals(16)){
entity.setServiceId(20);
}
+ }else if("DNS".equalsIgnoreCase(protocolType)){
+ if(entity.getAction().equals(1)){
+ entity.setServiceId(130);
+ }else if(entity.getAction().equals(16)){
+ entity.setServiceId(18);
+ }
}else if(StringUtils.isBlank(protocolType)){
if(MapUtils.isNotEmpty(entity.getUserRegion())&&entity.getUserRegion().containsKey("ipGroup")){
if(entity.getAction().equals(1)){
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 9ff4fd2dd..2ccfe9a31 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -116,15 +116,15 @@
-
+
-
+
-
+
-
+
@@ -435,6 +435,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
index 1c3c76c0d..5be4cab96 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
@@ -42,7 +42,7 @@ $(function(){
$(".domainGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").addClass("hidden").addClass("disabled");
$(".urlGroup").addClass("hidden").addClass("disabled");
- }else if($("[name=userRegion1]").val()=="mail"){
+ }else if($("[name=userRegion1]").val()=="mail"||$("[name=userRegion1]").val()=="dns"){
$(".domainGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".urlGroup").addClass("hidden").addClass("disabled");
@@ -116,7 +116,7 @@ $(function(){
$(".domainGroup").addClass("hidden").addClass("disabled");
//处理do_log
$(".doLog").removeClass("hidden");
- }else if("mail"==$(this).val()){
+ }else if("mail"==$(this).val()||"dns"==$(this).val()){
$(".urlGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
@@ -167,7 +167,7 @@ $(function(){
top.$.jBox.tip("", "");
return;
}else{
- if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail")&&ipGroupLen>0){
+ if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail"||$("[name='userRegion1']").val()=="dns")&&ipGroupLen>0){
if(grouplen>7){
top.$.jBox.tip("", "");
return;
@@ -182,6 +182,23 @@ $(function(){
flag=flag1;
}
if(flag){
+ if($("[name='userRegion1']").val()=="dns"&&$("[name='action']:checked").val()==16){
+ var flag2 = true;
+ var url = "${ctx}/cfg/dnsIp/dnsNoStrategyCheck";
+ $.ajax({
+ type:'post',
+ async:false,
+ url: url,
+ data:{"dnsStrategyId":0},
+ success:function(data){
+ flag2 = data;
+ }
+ });
+ if(!flag2){
+ top.$.jBox.tip($.validator.messages.noStrategyCheck, "");
+ return
+ }
+ }
//将disable属性的元素删除
$(".disabled").each(function(){
$(this).remove();
@@ -352,7 +369,6 @@ var delContent = function(contentClassName, addBtnClassName) {
-