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

(1)修复基础协议，app协议，加密隧道行为主配置被账号配置覆盖的bug

Browse Source 
(2)DNS配置下发时，只展示有审核通过的欺骗IP的DNS策略
This commit is contained in:
wangxin
2018-09-26 16:00:45 +08:00
parent 09baf72da3
commit 82a2e803ae
5 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,15 +202,15 @@ public class AppCfgService extends BaseService {
entity.setIsValid(0);
entity.setIsAudit(0);
// 设置SubscribeID域配置参数
if (entity != null && entity.getNtcSubscribeIdCfgList() != null) {
for (NtcSubscribeIdCfg cfg : entity.getNtcSubscribeIdCfgList()) {
entity.setExprType(cfg.getExprType());
entity.setIsHexbin(cfg.getIsHexbin());
entity.setMatchMethod(cfg.getMatchMethod());
entity.setCfgKeywords(cfg.getCfgKeywords());
}
}
entity.initDefaultValue();
// if (entity != null && entity.getNtcSubscribeIdCfgList() != null) {
// for (NtcSubscribeIdCfg cfg : entity.getNtcSubscribeIdCfgList()) {
// entity.setExprType(cfg.getExprType());
// entity.setIsHexbin(cfg.getIsHexbin());
// entity.setMatchMethod(cfg.getMatchMethod());
// entity.setCfgKeywords(cfg.getCfgKeywords());
// }
// }
// entity.initDefaultValue();
appCfgDao.insertAppPolicyCfg(entity);
// 保存策略IP配置
if (entity != null && entity.getIpPortList() != null) {
@@ -224,7 +224,7 @@ public class AppCfgService extends BaseService {
for (NtcSubscribeIdCfg cfg : entity.getNtcSubscribeIdCfgList()) {
if (StringUtils.isNotBlank(cfg.getCfgKeywords())) {
entity.setCfgKeywords(cfg.getCfgKeywords());
BeanUtils.copyProperties(entity, cfg, new String[] { "cfgRegionCode", "cfgType" });
BeanUtils.copyProperties(entity, cfg, new String[] { "cfgRegionCode", "cfgType", "exprType", "matchMethod", "isHexbin" });
stringcfgDao.saveSubscribeIdCfg(cfg);
}
}
@@ -244,13 +244,13 @@ public class AppCfgService extends BaseService {
entity.setIsValid(0);
entity.setIsAudit(0);
// 设置SubscribeID域配置参数
if (entity != null && entity.getNtcSubscribeIdCfgList() != null) {
for (NtcSubscribeIdCfg cfg : entity.getNtcSubscribeIdCfgList()) {
entity.setExprType(cfg.getExprType());
entity.setIsHexbin(cfg.getIsHexbin());
entity.setMatchMethod(cfg.getMatchMethod());
}
}
// if (entity != null && entity.getNtcSubscribeIdCfgList() != null) {
// for (NtcSubscribeIdCfg cfg : entity.getNtcSubscribeIdCfgList()) {
// entity.setExprType(cfg.getExprType());
// entity.setIsHexbin(cfg.getIsHexbin());
// entity.setMatchMethod(cfg.getMatchMethod());
// }
// }
appCfgDao.updateAppPolicyCfg(entity);
// 先删后加 各域配置