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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交
This commit is contained in:
duandongmei
2018-11-08 19:50:04 +08:00
parent 7a77f0ebcf 837574cd70
commit e59d98499e
181 changed files with 11974 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,8 @@ import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.callback.NtcDnsResStrategy;
import com.nis.domain.callback.ProxyObjKeyring;
import com.nis.domain.callback.ProxyObjTrustedCa;
import com.nis.domain.callback.ProxyObjTrustedCaCrl;
import com.nis.domain.configuration.AppIpCfg;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
@@ -35,6 +37,8 @@ import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
@@ -43,6 +47,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.IpUtil;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
/**
@@ -959,6 +964,35 @@ public abstract class BaseService {
proxyObjKeyring.setOpTime(cfg.getAuditTime());
return proxyObjKeyring;
}
//可信证书
public List<ProxyObjTrustedCa> convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,PxyObjTrustedCaCrl cfgCrl){
List<ProxyObjTrustedCa> proxyObjTrustedCas=new ArrayList<>();
ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa();
if(cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())){
proxyObjTrustedCaCert.setId(Long.valueOf(cfgCert.getCompileId()));
proxyObjTrustedCaCert.setCfgId(cfgCert.getCompileId());
proxyObjTrustedCaCert.setCertId(cfgCert.getCompileId());
proxyObjTrustedCaCert.setCertName(cfgCert.getCfgDesc());
proxyObjTrustedCaCert.setCertFile(cfgCert.getCertFile());
proxyObjTrustedCaCert.setService(cfgCert.getServiceId());
proxyObjTrustedCaCert.setIsValid(cfgCert.getIsValid());
proxyObjTrustedCaCert.setOpTime(cfgCert.getAuditTime());
proxyObjTrustedCas.add(proxyObjTrustedCaCert);
}
if(cfgCrl != null && !StringUtil.isEmpty(cfgCrl.getCompileId())){
proxyObjTrustedCaCert.setId(Long.valueOf(cfgCrl.getCompileId()));
proxyObjTrustedCaCert.setCfgId(cfgCrl.getCompileId());
proxyObjTrustedCaCert.setCertId(cfgCrl.getCertId());
proxyObjTrustedCaCert.setService(cfgCrl.getServiceId());
proxyObjTrustedCaCert.setIsValid(cfgCrl.getIsValid());
proxyObjTrustedCaCert.setOpTime(cfgCrl.getAuditTime());
proxyObjTrustedCaCert.setCrlId(cfgCrl.getCompileId());
proxyObjTrustedCaCert.setCrlFile(cfgCrl.getCrlFile());
proxyObjTrustedCas.add(proxyObjTrustedCaCert);
}
return proxyObjTrustedCas;
}
//ip转换为callback用ip
public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){
NtcDnsResStrategy resStrategy=new NtcDnsResStrategy();