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

批量下发功能增加，delRow.tag中暂时不打开此功能。

Browse Source 
app topic domain和app domain业务修改domain存储cfgkeyword属性。
摘要修改level属性存储为下发的最终数值。
同步的单域配置的增加时间和状态属性从entity中获取
This commit is contained in:
DuanDongmei
2018-12-05 17:56:41 +08:00
parent e5fa7cbca8
commit bb302e3f13
37 changed files with 2406 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1313,7 +1313,7 @@ public abstract class BaseService {
}
// 拦截策略
public ProxyObjKeyring convertCallBackProxyObjKeyring(PxyObjKeyring cfg) {
public static ProxyObjKeyring convertCallBackProxyObjKeyring(PxyObjKeyring cfg) {
ProxyObjKeyring proxyObjKeyring = new ProxyObjKeyring();
proxyObjKeyring.setId(Long.valueOf(cfg.getCompileId()));
proxyObjKeyring.setCfgId(cfg.getCompileId());
@@ -1332,7 +1332,7 @@ public abstract class BaseService {
}
// 可信证书
public List<ProxyObjTrustedCa> convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,
public static List<ProxyObjTrustedCa> convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,
PxyObjTrustedCaCrl cfgCrl) {
List<ProxyObjTrustedCa> proxyObjTrustedCas = new ArrayList<>();
if (cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())) {
@@ -1364,13 +1364,13 @@ public abstract class BaseService {
}
// ip转换为callback用ip
public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg) {
public static NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg) {
NtcDnsResStrategy resStrategy = new NtcDnsResStrategy();
resStrategy.init();
resStrategy.setId(Long.valueOf(cfg.getCompileId()));
resStrategy.setCfgId(cfg.getCompileId());
resStrategy.setReqStrateId(cfg.getCfgId());
resStrategy.setStrateName(this.keywordsEscape(cfg.getCfgDesc()));
resStrategy.setStrateName(keywordsEscape(cfg.getCfgDesc()));
resStrategy.setAction(cfg.getAction());
resStrategy.setService(cfg.getServiceId());
resStrategy.setResGroup1Id(cfg.getResGroup1Id());