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 c2e909406..915eabd18 100644
--- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
+++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
@@ -119,6 +119,12 @@ public class ObjectGroupService extends BaseService {
}else if(entity.getAction().equals(16)){
entity.setServiceId(18);
}
+ }else if("FTP".equalsIgnoreCase(protocolType)){
+ if(entity.getAction().equals(1)){
+ entity.setServiceId(133);
+ }else if(entity.getAction().equals(16)){
+ entity.setServiceId(21);
+ }
}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 2ccfe9a31..f2df1291e 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -191,14 +191,16 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
+
@@ -435,6 +437,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 5be4cab96..12995535e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
@@ -34,7 +34,7 @@ $(function(){
//处理do_log
$(".doLog").addClass("hidden");
$("[name='doLog']").find("[value=2]").prop("checked",true);
- }else if('${_cfg.userRegion1}'=='https'||'${_cfg.userRegion1}'=='http'){
+ }else if('${_cfg.userRegion1}'=='https'||'${_cfg.userRegion1}'=='http'||'${_cfg.userRegion1}'=='ftp'){
$(".domainGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".urlGroup").removeClass("hidden").removeClass("disabled");
@@ -98,18 +98,12 @@ $(function(){
$(this).removeAttr("checked");
}
})
- }else if("https"==$(this).val()){
+ }else if("https"==$(this).val()||"http"==$(this).val()||"ftp"==$(this).val()){
$(".urlGroup").removeClass("hidden").removeClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
//处理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");
@@ -167,7 +161,7 @@ $(function(){
top.$.jBox.tip("", "");
return;
}else{
- if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail"||$("[name='userRegion1']").val()=="dns")&&ipGroupLen>0){
+ if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail"||$("[name='userRegion1']").val()=="dns"||$("[name='userRegion1']").val()=="ftp")&&ipGroupLen>0){
if(grouplen>7){
top.$.jBox.tip("", "");
return;
@@ -368,7 +362,6 @@ var delContent = function(contentClassName, addBtnClassName) {
-