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

配置同步的topic domain自定义域需要获取域名id，此信息未在配置表中保存，需从website_domain_topic表中获取

Browse Source
This commit is contained in:
DuanDongmei
2018-12-09 13:50:05 +08:00
parent 9ac32fe3ff
commit d9cef1cc67
1 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -40,6 +40,7 @@ import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring; import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert; import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl; import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.domain.maat.GroupReuseAddBean; import com.nis.domain.maat.GroupReuseAddBean;
import com.nis.domain.maat.GroupReuseCfg; import com.nis.domain.maat.GroupReuseCfg;
import com.nis.domain.maat.MaatCfg; import com.nis.domain.maat.MaatCfg;
@@ -60,6 +61,7 @@ import com.nis.util.DictUtils;
import com.nis.util.FileUtils; import com.nis.util.FileUtils;
import com.nis.util.ServiceConfigTemplateUtil; import com.nis.util.ServiceConfigTemplateUtil;
import com.nis.util.StringUtil; import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AppCfgDao;
import com.nis.web.dao.configuration.CommonPolicyDao; import com.nis.web.dao.configuration.CommonPolicyDao;
import com.nis.web.dao.configuration.ConfigSynchronizationDao; import com.nis.web.dao.configuration.ConfigSynchronizationDao;
import com.nis.web.dao.specific.ConfigGroupInfoDao; import com.nis.web.dao.specific.ConfigGroupInfoDao;
@@ -82,6 +84,8 @@ public class ConfigSynchronizationService extends BaseService{
protected SpecificServiceCfgDao specificServiceCfgDao; protected SpecificServiceCfgDao specificServiceCfgDao;
@Autowired @Autowired
protected ConfigGroupInfoDao configGroupInfoDao; protected ConfigGroupInfoDao configGroupInfoDao;
@Autowired
protected AppCfgDao appCfgDao;
private boolean lastServiceTag = false;//标识是否是最后一个同步业务 private boolean lastServiceTag = false;//标识是否是最后一个同步业务
private boolean isFinished = false; private boolean isFinished = false;
/** /**
@@ -1276,41 +1280,52 @@ public class ConfigSynchronizationService extends BaseService{
areaIpRegionList = new ArrayList(); areaIpRegionList = new ArrayList();
List list1 = new ArrayList(); List list1 = new ArrayList();
String userRegion = ""; String userRegion = "";
//处理自定义域 //处理自定义域
if(userRegionList!=null){ if(userRegionList!=null){
for(Map<String,Object> n:userRegionList){ for(Map<String,Object> n:userRegionList){
Object userRegionPosition = n.get("userRegionPosition"); if(entity.getTableName().equals("app_topic_domain_cfg")){
if(userRegionPosition!=null){ String domain = strCfg.getCfgKeywords();
//通过反射机制获取自定义域字段值 WebsiteDomainTopic websiteDomainTopic = new WebsiteDomainTopic();
String regionColumn = n.get("regionColumn").toString(); websiteDomainTopic.setDomain(domain);
Class aClass = null; //查询domainId
if(userRegionPosition.toString().equals(("0"))){ List<WebsiteDomainTopic> domainDict = appCfgDao.getDomainDict(websiteDomainTopic);
aClass = BaseCfg.class; Long domainId = domainDict.get(0).getId();
}else{ userRegion += n.get("regionKey")+"="+domainId+Constants.USER_REGION_SPLIT;
if(cfgType==1){ }else{
aClass = IpPortCfg.class; Object userRegionPosition = n.get("userRegionPosition");
}else if(cfgType==2){ if(userRegionPosition!=null){
aClass = BaseStringCfg.class; //通过反射机制获取自定义域字段值
}else if(cfgType==3){ String regionColumn = n.get("regionColumn").toString();
aClass = ComplexkeywordCfg.class; Class aClass = null;
} if(userRegionPosition.toString().equals(("0"))){
} aClass = BaseCfg.class;
Object value = "";
Field field = aClass.getDeclaredField(regionColumn);
field.setAccessible(true);
if(cfgType==1){
value = field.get(ipCfg);
}else if(cfgType==2){
value = field.get(strCfg);
}else if(cfgType==3){
value = field.get(complexStrCfg);
}
if(!StringUtil.isEmpty(value)){
if(StringUtil.isEmpty(n.get("regionKey"))){
userRegion = value.toString();
}else{ }else{
userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT; if(cfgType==1){
aClass = IpPortCfg.class;
}else if(cfgType==2){
aClass = BaseStringCfg.class;
}else if(cfgType==3){
aClass = ComplexkeywordCfg.class;
}
}
Object value = "";
Field field = aClass.getDeclaredField(regionColumn);
field.setAccessible(true);
if(cfgType==1){
value = field.get(ipCfg);
}else if(cfgType==2){
value = field.get(strCfg);
}else if(cfgType==3){
value = field.get(complexStrCfg);
}
if(!StringUtil.isEmpty(value)){
if(StringUtil.isEmpty(n.get("regionKey"))){
userRegion = value.toString();
}else{
userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
}
} }
} }
} }