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

修改sql文件后缀

Browse Source 
全量更新特定服务模块数据与亦庄环境数据同步
修改证书管理以及可信证书模块bug
This commit is contained in:
duandongmei
2018-11-09 14:17:52 +08:00
parent ab1e55c5cd
commit 9b3caca055
7 changed files with 71 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,8 +967,8 @@ public abstract class BaseService {
//可信证书
public List<ProxyObjTrustedCa> convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,PxyObjTrustedCaCrl cfgCrl){
List<ProxyObjTrustedCa> proxyObjTrustedCas=new ArrayList<>();
ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa();
if(cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())){
ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa();
proxyObjTrustedCaCert.setId(Long.valueOf(cfgCert.getCompileId()));
proxyObjTrustedCaCert.setCfgId(cfgCert.getCompileId());
proxyObjTrustedCaCert.setCertId(cfgCert.getCompileId());
@@ -980,6 +980,7 @@ public abstract class BaseService {
proxyObjTrustedCas.add(proxyObjTrustedCaCert);
}
if(cfgCrl != null && !StringUtil.isEmpty(cfgCrl.getCompileId())){
ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa();
proxyObjTrustedCaCert.setId(Long.valueOf(cfgCrl.getCompileId()));
proxyObjTrustedCaCert.setCfgId(cfgCrl.getCompileId());
proxyObjTrustedCaCert.setCertId(cfgCrl.getCertId());