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/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();