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" });