恢复ip和代理模块审核方法中二次查询域信息代码,避免同一种域允许新增多个的问题
This commit is contained in:
@@ -379,6 +379,9 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
|
|||||||
List<DigestCfg> digestRegionList = new ArrayList();
|
List<DigestCfg> digestRegionList = new ArrayList();
|
||||||
List<IpCfg> areaIpRegionList = new ArrayList();
|
List<IpCfg> areaIpRegionList = new ArrayList();
|
||||||
|
|
||||||
|
//查询子配置并修改审核状态
|
||||||
|
entity = this.getHttpCfg(entity.getCfgId(),entity.getCompileId());
|
||||||
|
|
||||||
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
|
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
|
||||||
IpPortCfg cfg = new IpPortCfg();
|
IpPortCfg cfg = new IpPortCfg();
|
||||||
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
|
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
|
||||||
|
|||||||
@@ -378,6 +378,8 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
|
|||||||
List<DigestCfg> digestRegionList = new ArrayList();
|
List<DigestCfg> digestRegionList = new ArrayList();
|
||||||
List<IpCfg> areaIpRegionList = new ArrayList();
|
List<IpCfg> areaIpRegionList = new ArrayList();
|
||||||
|
|
||||||
|
//查询子配置并修改审核状态
|
||||||
|
entity = this.getInterceptCfg(entity.getCfgId(),entity.getCompileId());
|
||||||
if(entity.getServiceId().equals(518)){//IP仿冒策略
|
if(entity.getServiceId().equals(518)){//IP仿冒策略
|
||||||
//仿冒IP池配置匹配下发或者取消
|
//仿冒IP池配置匹配下发或者取消
|
||||||
PxyObjSpoofingIpPool pool=new PxyObjSpoofingIpPool();
|
PxyObjSpoofingIpPool pool=new PxyObjSpoofingIpPool();
|
||||||
|
|||||||
@@ -572,6 +572,10 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
|
|||||||
// 获取region
|
// 获取region
|
||||||
List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
|
List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
|
||||||
int maatType = 0;
|
int maatType = 0;
|
||||||
|
|
||||||
|
//查询子配置并修改审核状态
|
||||||
|
entity = this.getIpPortCfg(entity.getCfgId(),entity.getCompileId());
|
||||||
|
|
||||||
if (entity.getIpPortList() != null && entity.getIpPortList().size() > 0) {
|
if (entity.getIpPortList() != null && entity.getIpPortList().size() > 0) {
|
||||||
// 判断下发类型是走maat还是callback
|
// 判断下发类型是走maat还是callback
|
||||||
String regionValue = entity.getIpPortList().get(0).getCfgType();
|
String regionValue = entity.getIpPortList().get(0).getCfgType();
|
||||||
|
|||||||
Reference in New Issue
Block a user