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 930897bac..582117cfd 100644
--- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
+++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
@@ -107,6 +107,14 @@ public class ObjectGroupService extends BaseService {
}else if(entity.getAction().equals(16)){
entity.setServiceId(17);
}
+ }else if(StringUtils.isBlank(protocolType)){
+ if(MapUtils.isNotEmpty(entity.getUserRegion())&&entity.getUserRegion().containsKey("ipGroup")){
+ if(entity.getAction().equals(1)){
+ entity.setServiceId(128);
+ }else if(entity.getAction().equals(16)){
+ entity.setServiceId(16);
+ }
+ }
}
if(entity.getCfgId()==null){
Integer compileId = 0;
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 62e4afccd..02b4ce528 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -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 866a1582e..eebe22314 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
@@ -28,6 +28,7 @@ $(function(){
})
}
if('${_cfg.userRegion1}'=='intercept'){
+ $(".domainGroup").removeClass("hidden").removeClass("disabled");
$(".urlGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").addClass("hidden").addClass("disabled");
//处理do_log
@@ -35,10 +36,16 @@ $(function(){
$("[name='doLog']").find("[value=2]").prop("checked",true);
}else if('${_cfg.userRegion1}'=='https'||'${_cfg.userRegion1}'=='http'){
$(".domainGroup").addClass("hidden").addClass("disabled");
+ $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
+ $(".urlGroup").removeClass("hidden").removeClass("disabled");
}else if("${_cfg.userRegion1}"==""){
- if($("[name=userRegion1]").val()!="intercept"){
- $(".domainGroup").addClass("hidden").addClass("disabled");
- }
+ $(".domainGroup").addClass("hidden").addClass("disabled");
+ $(".subscribeIdGroup").addClass("hidden").addClass("disabled");
+ $(".urlGroup").addClass("hidden").addClass("disabled");
+ }else if($("[name=userRegion1]").val()!="intercept"){
+ $(".domainGroup").addClass("hidden").addClass("disabled");
+ $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
+ $(".urlGroup").removeClass("hidden").removeClass("disabled");
}
@@ -99,6 +106,14 @@ $(function(){
//处理do_log
$(".doLog").removeClass("hidden");
}else if("http"==$(this).val()){
+ $(".domainGroup").addClass("hidden").addClass("disabled");
+ $(".urlGroup").removeClass("hidden").removeClass("disabled");
+ $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
+ //处理do_log
+ $(".doLog").removeClass("hidden");
+ }else if(""==$(this).val()){
+ $(".urlGroup").addClass("hidden").addClass("disabled");
+ $(".subscribeIdGroup").addClass("hidden").addClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
//处理do_log
$(".doLog").removeClass("hidden");
@@ -323,10 +338,11 @@ var delContent = function(contentClassName, addBtnClassName) {