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

多域的日志增加可查看配置详情，隐藏日志中的查看详情，提供可以复制日志过长title功能

Browse Source
This commit is contained in:
zhanghongqing
2018-11-28 19:23:38 +08:00
parent 7ab1a38131
commit 1fbc899269
75 changed files with 869 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,8 +165,8 @@ public class AppCfgService extends BaseService {
return appCfgDao.getAppTcpCfg(cfgId);
}
public AppPolicyCfg getAppPolicyCfg(Long cfgId) {
AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId);
public AppPolicyCfg getAppPolicyCfg(Long cfgId,Integer compileId) {
AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId,compileId);
List<IpPortCfg> ipPortList = appCfgDao.getAppPolicyIpList(policy);
// 查询关键字
if (policy.getCompileId() != null) {
@@ -906,7 +906,7 @@ public class AppCfgService extends BaseService {
}
// 查询子配置并修改审核状态
entity = this.getAppPolicyCfg(entity.getCfgId());
entity = this.getAppPolicyCfg(entity.getCfgId(),entity.getCompileId());
if (entity.getIpPortList() != null && entity.getIpPortList().size() > 0) {
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });
@@ -1697,7 +1697,7 @@ public class AppCfgService extends BaseService {
appCfgDao.updateCfgValid(entity);
// 查询子配置
entity = this.getAppPolicyCfg(Long.parseLong(id));
entity = this.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
if (entity.getIpPortList() != null && entity.getIpPortList().size() > 0) {
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });

8
src/main/java/com/nis/web/service/configuration/BgpCfgService.java
View File

@@ -48,8 +48,8 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
@Autowired
protected AreaIpCfgDao areaIpCfgDao;
public CfgIndexInfo getBgpCfg(Long cfgId){
CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = bgpCfgDao.getIpPortList(entity);
NtcSubscribeIdCfg subscribeId = new NtcSubscribeIdCfg();
subscribeId.setCompileId(entity.getCompileId());
@@ -247,7 +247,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
entity.setFunctionId(functionId);
bgpCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getBgpCfg(Long.parseLong(id));
entity = this.getBgpCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -309,7 +309,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getBgpCfg(entity.getCfgId());
entity = this.getBgpCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

8
src/main/java/com/nis/web/service/configuration/DomainService.java
View File

@@ -417,8 +417,8 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
// TODO Auto-generated method stub
return domainDao.getListByCfgId(ids);
}
public CfgIndexInfo getDomainCfg(Long cfgId) {
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getDomainCfg(Long cfgId,Integer compileId) {
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
entity.setHttpUrlList(httpUrlList);
@@ -532,7 +532,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
entity.setFunctionId(functionId);
websiteCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getDomainCfg(Long.parseLong(id));
entity = this.getDomainCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0)
{
@@ -576,7 +576,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getDomainCfg(entity.getCfgId());
entity = this.getDomainCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
HttpUrlCfg cfg = new HttpUrlCfg();

28
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -73,8 +73,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
page.setList(list);
return page;
}
public CfgIndexInfo getFtpCfg(Long cfgId){
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getFtpCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = fileTransferCfgDao.getIpPortList(entity);
List<BaseStringCfg> keywordList = fileTransferCfgDao.getFtpKeywordList(entity);
//设置关键字
@@ -233,7 +233,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setFunctionId(functionId);
fileTransferCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getFtpCfg(Long.parseLong(id));
entity = this.getFtpCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -282,7 +282,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getFtpCfg(entity.getCfgId());
entity = this.getFtpCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -401,8 +401,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
return page;
}
public FileDigestCfg getFileDigestCfg(Long cfgId){
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
public FileDigestCfg getFileDigestCfg(Long cfgId,Integer compileId){
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
List<NtcSubscribeIdCfg> subscribeidList = fileTransferCfgDao.getFileDigestSubscribeidList(entity);
entity.setNtcSubscribeIdCfgList(subscribeidList);
return entity;
@@ -526,7 +526,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setFunctionId(functionId);
fileTransferCfgDao.updateFileDigestCfg(entity);
entity = this.getFileDigestCfg(Long.parseLong(id));
entity = this.getFileDigestCfg(Long.parseLong(id),entity.getCompileId());
// 修改子域配置状态
if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
@@ -552,7 +552,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setAuditTime(auditTime);
fileTransferCfgDao.updateFileDigestCfg(entity);
entity = this.getFileDigestCfg(Long.parseLong(id));
entity = this.getFileDigestCfg(Long.parseLong(id),entity.getCompileId());
// 修改域配置审核状态
if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
@@ -655,8 +655,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
}
public FileDigestCfg getFileDigestSubIdCfg(Long cfgId) {
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
public FileDigestCfg getFileDigestSubIdCfg(Long cfgId,Integer compileId) {
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
if(entity.getCompileId()!=null){
NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
ntcSubscribeIdCfg.setCompileId(entity.getCompileId());
@@ -675,9 +675,9 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
return page;
}
public CfgIndexInfo getP2pCfg(Long cfgId){
public CfgIndexInfo getP2pCfg(Long cfgId,Integer compileId){
// 查询各域配置信息
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId);
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = fileTransferCfgDao.getIpPortList(entity);
List<P2pHashCfg> hashList = fileTransferCfgDao.getP2pHashList(entity);
List<P2pKeywordCfg> keywordList = fileTransferCfgDao.getP2pKeywordList(entity);
@@ -866,7 +866,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setFunctionId(functionId);
fileTransferCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getP2pCfg(Long.parseLong(id));
entity = this.getP2pCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -921,7 +921,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getP2pCfg(entity.getCfgId());
entity = this.getP2pCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

8
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -54,8 +54,8 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
@Autowired
protected StringCfgDao stringCfgDao;
public CfgIndexInfo getHttpCfg(Long cfgId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getHttpCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
List<HttpReqHeadCfg> httpReqHdrList = websiteCfgDao.getHttpReqHdrList(entity);
List<HttpResHeadCfg> httpResHdrList = websiteCfgDao.getHttpResHdrList(entity);
@@ -284,7 +284,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
entity.setFunctionId(functionId);
websiteCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getHttpCfg(Long.parseLong(id));
entity = this.getHttpCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
@@ -350,7 +350,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getHttpCfg(entity.getCfgId());
entity = this.getHttpCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();

8
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -52,8 +52,8 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
@Autowired
protected AreaIpCfgDao areaIpCfgDao;
public CfgIndexInfo getInterceptCfg(Long cfgId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getInterceptCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
List<InterceptPktBin> pktBinList = interceptCfgDao.getInterceptPktBin(entity);
List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
@@ -219,7 +219,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
entity.setFunctionId(functionId);
websiteCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getInterceptCfg(Long.parseLong(id));
entity = this.getInterceptCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -273,7 +273,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getInterceptCfg(entity.getCfgId());
entity = this.getInterceptCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

8
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -206,7 +206,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
entity.setFunctionId(functionId);
ipCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getIpPortCfg(Long.parseLong(id));
entity = this.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -468,7 +468,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
int maatType=0;
//查询子配置并修改审核状态
entity = this.getIpPortCfg(entity.getCfgId());
entity = this.getIpPortCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
//判断下发类型是走maat还是callback
String regionValue=entity.getIpPortList().get(0).getCfgType();
@@ -827,8 +827,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){
return ipCfgDao.getById(baseIpCfg.getTableName(), baseIpCfg.getCfgId());
}
public CfgIndexInfo getIpPortCfg(Long cfgId){
CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getIpPortCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = ipCfgDao.getIpPortList(entity);
List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
entity.setIpPortList(ipPortList);

8
src/main/java/com/nis/web/service/configuration/MailCfgService.java
View File

@@ -66,8 +66,8 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
page.setList(list);
return page;
}
public CfgIndexInfo getMailCfg(Long cfgId){
CfgIndexInfo entity = mailCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getMailCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = mailCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = mailCfgDao.getIpPortList(entity);
List<ComplexkeywordCfg> keywordList = mailCfgDao.getMailKeywordList(entity);
List<FileDigestCfg> digestList = mailCfgDao.getMailFileDigestList(entity);
@@ -246,7 +246,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
entity.setFunctionId(functionId);
mailCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getMailCfg(Long.parseLong(id));
entity = this.getMailCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -294,7 +294,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getMailCfg(entity.getCfgId());
entity = this.getMailCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

24
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

@@ -69,8 +69,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
}
return entity;
}
public CfgIndexInfo getHttpCfg(Long cfgId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getHttpCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
List<HttpReqHeadCfg> httpReqHdrList = websiteCfgDao.getHttpReqHdrList(entity);
@@ -144,8 +144,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
public CfgIndexInfo getSslCfg(Long cfgId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getSslCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
List<BaseStringCfg> sslList = websiteCfgDao.getSslKewordList(entity);
List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
@@ -154,8 +154,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
entity.setSslList(sslList);
return entity;
}
public CfgIndexInfo getDnsCfg(Long cfgId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getDnsCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
List<ComplexkeywordCfg> domainList = websiteCfgDao.getDnsDomainList(entity);
List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
@@ -372,7 +372,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
entity.setFunctionId(functionId);
websiteCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getHttpCfg(Long.parseLong(id));
entity = this.getHttpCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -437,7 +437,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getHttpCfg(entity.getCfgId());
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"});
@@ -802,7 +802,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
entity.setFunctionId(functionId);
websiteCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getSslCfg(Long.parseLong(id));
entity = this.getSslCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -850,7 +850,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getSslCfg(entity.getCfgId());
entity = this.getSslCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -1087,7 +1087,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
entity.setFunctionId(functionId);
websiteCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getDnsCfg(Long.parseLong(id));
entity = this.getDnsCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -1141,7 +1141,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getDnsCfg(entity.getCfgId());
entity = this.getDnsCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});