diff --git a/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java b/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java index 7a2e82e05..d9987bd78 100644 --- a/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java +++ b/src/main/java/com/nis/domain/configuration/ObjGroupCfg.java @@ -14,6 +14,9 @@ public class ObjGroupCfg extends BaseCfg { private String domainGroup; @ExcelField(title="block_type",sort=2)//这里没有使用公共方法处理,直接将字典值set进去了,不用使用dictType protected String actionCode; + @ExcelField(title="protocol",sort=3) + protected String userRegion1; + public String getActionCode() { return actionCode; } diff --git a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java index f3450437f..e63e1fe04 100644 --- a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java +++ b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java @@ -103,17 +103,17 @@ public class ObjectGroupController extends BaseController { urlGroup=formatMultSelect(request.getParameterValues("urlGroup")); Map map = new HashMap(); - if(StringUtils.isNotBlank(ipGroup)){ - map.put("ipGroup", ipGroup.toString()); + if(StringUtils.isNotBlank(ipGroup)&&StringUtils.isNotBlank(ipGroup.replaceAll(",",""))){ + map.put("ipGroup", ipGroup); } - if(StringUtils.isNotBlank(subscribeIdGroup)){ - map.put("subscribeIdGroup", subscribeIdGroup.toString()); + if(StringUtils.isNotBlank(subscribeIdGroup)&&StringUtils.isNotBlank(subscribeIdGroup.replaceAll(",",""))){ + map.put("subscribeIdGroup", subscribeIdGroup); } - if(StringUtils.isNotBlank(domainGroup)){ - map.put("domainGroup", domainGroup.toString()); + if(StringUtils.isNotBlank(domainGroup)&&StringUtils.isNotBlank(domainGroup.replaceAll(",",""))){ + map.put("domainGroup", domainGroup); } - if(StringUtils.isNotBlank(urlGroup)){ - map.put("urlGroup", urlGroup.toString()); + if(StringUtils.isNotBlank(urlGroup)&&StringUtils.isNotBlank(urlGroup.replaceAll(",",""))){ + map.put("urlGroup", urlGroup); } cfg.setUserRegion(map); objectGroupService.saveOrUpdate(cfg); 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 582117cfd..e30091044 100644 --- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java +++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java @@ -209,7 +209,10 @@ public class ObjectGroupService extends BaseService { }else{ if(StringUtils.isNotBlank(e.getValue().toString())){ String val=e.getValue().toString().substring(0,e.getValue().toString().length()-1); - canceledGroup.append(val); + if(StringUtils.isNotBlank(val)){ + canceledGroup.append(val); + } + } } } @@ -219,20 +222,32 @@ public class ObjectGroupService extends BaseService { for(Object val:newMap.values()){ String _val=(String)val; if(StringUtils.isNotBlank(_val)){ - if(_val.startsWith(",")){ + if(_val.startsWith(",")&&!",".equals(_val.trim())){ okGroup.append(_val.substring(1)); - }else{ + }else if(StringUtils.isNotBlank(_val)){ okGroup.append(_val); } } } //取消勾选的组更新UD_FLAG if(StringUtils.isNotBlank(canceledGroup.toString())){ - policyGroupInfoDao.updateUdFlag(canceledGroup.toString().substring(1),1,null); + if(canceledGroup.toString().startsWith(",")){ + canceledGroup.deleteCharAt(0); + } + if(canceledGroup.toString().endsWith(",")){ + canceledGroup.deleteCharAt(canceledGroup.toString().length()-1); + } + policyGroupInfoDao.updateUdFlag(canceledGroup.toString(),1,null); } //新选择的组更新UD_FALG if(StringUtils.isNotBlank(okGroup.toString())){ - okGroup.deleteCharAt(okGroup.toString().length()-1); + if(okGroup.toString().startsWith(",")){ + okGroup.deleteCharAt(0); + } + if(okGroup.toString().endsWith(",")){ + okGroup.deleteCharAt(okGroup.toString().length()-1); + } + policyGroupInfoDao.updateUdFlag(okGroup.toString(),2,null); } }else if(MapUtils.isNotEmpty(entity.getUserRegion())){ @@ -545,9 +560,9 @@ public class ObjectGroupService extends BaseService { StringBuffer buf=new StringBuffer(); for(Object val:dataMap.values()){ String _val=(String)val; - if(_val.startsWith(",")){ + if(_val.startsWith(",")&&!",".equals(_val)){ buf.append(_val.substring(1)); - }else{ + }else if(StringUtils.isNotBlank(_val)){ buf.append(_val); } } @@ -577,6 +592,13 @@ public class ObjectGroupService extends BaseService { c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode())); } } + if(c.getUserRegion1().equalsIgnoreCase("https")){ + c.setUserRegion1("HTTPS"); + }else if(c.getUserRegion1().equalsIgnoreCase("http")){ + c.setUserRegion1("HTTP"); + }else if(c.getUserRegion1().equalsIgnoreCase("intercept")){ + c.setUserRegion1("Intercept"); + } } if(StringUtils.isNotBlank(groupIds.toString())){ groupIds.deleteCharAt(groupIds.toString().length()-1); @@ -639,6 +661,13 @@ public class ObjectGroupService extends BaseService { c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode())); } } + if(c.getUserRegion1().equalsIgnoreCase("https")){ + c.setUserRegion1("HTTPS"); + }else if(c.getUserRegion1().equalsIgnoreCase("http")){ + c.setUserRegion1("HTTP"); + }else if(c.getUserRegion1().equalsIgnoreCase("intercept")){ + c.setUserRegion1("Intercept"); + } } if(StringUtils.isNotBlank(groupIds.toString())){ groupIds.deleteCharAt(groupIds.toString().length()-1); 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 eebe22314..4d61fa121 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp @@ -144,7 +144,7 @@ $(function(){ // return; //} //限制组必选一个,并且最多选择8个组 - var ipGroupLen=$("[name='ipGroup'] option:selected").length,subscribeIdGroupLen=$("[name='subscribeIdGroup'] option:selected").length,urlGroupLen=$("[name='urlGroup'] option:selected").length,domainGroupLen=$("[name='domainGroup'] option:selected").length; + var ipGroupLen=$("[name='ipGroup'] option[value!='']:selected").length,subscribeIdGroupLen=$("[name='subscribeIdGroup'] option[value!='']:selected").length,urlGroupLen=$("[name='urlGroup'] option[value!='']:selected").length,domainGroupLen=$("[name='domainGroup'] option[value!='']:selected").length; var grouplen=0; if($(".ipGroup").is(":visible")){ grouplen+=ipGroupLen; @@ -356,6 +356,7 @@ var delContent = function(contentClassName, addBtnClassName) {
+ @@ -385,6 +387,7 @@ var delContent = function(contentClassName, addBtnClassName) {
+ diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp index bea3a13d0..f92ea8ecc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp @@ -435,6 +435,7 @@ + @@ -480,6 +481,11 @@ + + HTTP + HTTPS + Intercept + ${fn:substring(cfg.userRegion.ipGroup,1,fn:length(cfg.userRegion.ipGroup)-1)} ${fn:substring(cfg.userRegion.subscribeIdGroup,1,fn:length(cfg.userRegion.subscribeIdGroup)-1)} ${fn:substring(cfg.userRegion.urlGroup,1,fn:length(cfg.userRegion.urlGroup)-1)}