diff options
| author | 段冬梅 <[email protected]> | 2019-04-28 12:03:16 +0800 |
|---|---|---|
| committer | 段冬梅 <[email protected]> | 2019-04-28 12:03:16 +0800 |
| commit | 8e724393e13a1af320a23e08f2e5b1a3172cf5a2 (patch) | |
| tree | 89d33a52938da53101e78b178a89dee6b4b8f45f | |
| parent | 494fb0669a5c87e58c56cf15d74b7dd27d42a147 (diff) | |
恢复ip和代理模块审核方法中二次查询域信息代码，避免同一种域允许新增多个的问题
3 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index 3baedba3d..add578a70 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -379,6 +379,9 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
+ //查询子配置并修改审核状态
+ entity = this.getHttpCfg(entity.getCfgId(),entity.getCompileId());
+
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index 9fcae125f..694080a23 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -378,6 +378,8 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
+ //查询子配置并修改审核状态
+ entity = this.getInterceptCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getServiceId().equals(518)){//IP仿冒策略
//仿冒IP池配置匹配下发或者取消
PxyObjSpoofingIpPool pool=new PxyObjSpoofingIpPool();
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 25b1ed4a8..cf1d09e46 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -572,6 +572,10 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> { // 获取region
List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
int maatType = 0;
+
+ //查询子配置并修改审核状态
+ entity = this.getIpPortCfg(entity.getCfgId(),entity.getCompileId());
+
if (entity.getIpPortList() != null && entity.getIpPortList().size() > 0) {
// 判断下发类型是走maat还是callback
String regionValue = entity.getIpPortList().get(0).getCfgType();
|