gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

社交应用服务器IP所属分组非第一次下发时，无需再次下发具体IP列表信息，只下发groupId与compileId，以及业务配置其他基础信息即可。

Browse Source
This commit is contained in:
zhangwei
2018-04-03 13:54:05 +08:00
parent 83a60871c0
commit 420be8558f
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -275,7 +275,7 @@ public class AppCfgService extends CrudService<AppCfgDao,AppIdCfg> {
List<AppComplexKeywordCfg> complexList = new ArrayList(); List<AppComplexKeywordCfg> complexList = new ArrayList();
List<SpecificServiceHostCfg> hostList =new ArrayList(); List<SpecificServiceHostCfg> hostList =new ArrayList();
List<BaseIpCfg> areaList = new ArrayList(); List<BaseIpCfg> areaList = new ArrayList();
ConfigGroupInfo group = new ConfigGroupInfo(); ConfigGroupInfo group = null;
Gson gson=new GsonBuilder().disableHtmlEscaping() Gson gson=new GsonBuilder().disableHtmlEscaping()
@@ -289,11 +289,20 @@ public class AppCfgService extends CrudService<AppCfgDao,AppIdCfg> {
if(Constants.AUDIT_YES==entity.getIsAudit().intValue()){//审核通过 if(Constants.AUDIT_YES==entity.getIsAudit().intValue()){//审核通过
if(StringUtil.isEmpty(featuresTableList)){ if(StringUtil.isEmpty(featuresTableList)){
SpecificServiceCfg protocol = specificServiceCfgDao.getBySpecServiceId(appCfg.getAppId().intValue()); SpecificServiceCfg protocol = specificServiceCfgDao.getBySpecServiceId(appCfg.getAppId().intValue());
group = specificServiceCfgDao.getConfigGroupInfoByGroupId(protocol.getGroupId());
//featuresTableList为空的时候，该service只有特定服务IP一个配置表
ServiceConfigInfo serviceCfg=serviceConfigInfoDao.findSysServiceConfigInfo(appCfg.getServiceId());
if(group==null){
throw new RuntimeException("配置审核失败，未获取社交应用服务器IP所属分组信息");
}else{
if(group.getIsIssued()==0){
//如果分组信息尚未下发，则下发IP
group.setGroupId(protocol.getGroupId());
group.setIsIssued(1);
SpecificServiceHostCfg hostCfg = new SpecificServiceHostCfg(); SpecificServiceHostCfg hostCfg = new SpecificServiceHostCfg();
hostCfg.setSpecServiceId(protocol.getSpecServiceId()); hostCfg.setSpecServiceId(protocol.getSpecServiceId());
hostList = specificServiceHostCfgDao.findSpecHostList(hostCfg); hostList = specificServiceHostCfgDao.findSpecHostList(hostCfg);
//featuresTableList为空的时候，该service只有特定服务IP一个配置表
ServiceConfigInfo serviceCfg=serviceConfigInfoDao.findSysServiceConfigInfo(appCfg.getServiceId());
for(SpecificServiceHostCfg host:hostList){ for(SpecificServiceHostCfg host:hostList){
SpecificServiceCfg specServiceCfg = specificServiceCfgDao.getBySpecServiceId(host.getSpecServiceId()); SpecificServiceCfg specServiceCfg = specificServiceCfgDao.getBySpecServiceId(host.getSpecServiceId());
host.setProtocolId(0); host.setProtocolId(0);
@@ -303,10 +312,15 @@ public class AppCfgService extends CrudService<AppCfgDao,AppIdCfg> {
}else{ }else{
host.setMaatTable(serviceCfg.getMaatTable()); host.setMaatTable(serviceCfg.getMaatTable());
} }
group.setGroupId(specServiceCfg.getGroupId());
group.setIsIssued(1);
} }
}else{
SpecificServiceHostCfg host = new SpecificServiceHostCfg();
host.setGroupId(protocol.getGroupId());
hostList.add(host);
}
}
//生效区域列表信息 //生效区域列表信息
if(appCfg.getIsAreaEffective()==1){ if(appCfg.getIsAreaEffective()==1){
if(StringUtil.isEmpty(appCfg.getAreaEffectiveIds())){ if(StringUtil.isEmpty(appCfg.getAreaEffectiveIds())){