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

Merge branch 'develop_no_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop_no_common_group

Browse Source
This commit is contained in:
zhangwenqing
2019-06-10 18:32:17 +08:00
parent bf03ca1cc0 7dc9e4ac43
commit 4d4d1d9153
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -550,9 +550,12 @@ public class PxyObjKeyringController extends BaseController {
Page<PxyObjTrustedCaCert> page = pxyObjKeyringService.findTrustedCertPage(pageInfo, entity);
ipLists = page.getList();
}
Properties prop = getMsgProp();
for (PxyObjTrustedCaCert cert : ipLists) {
if (!StringUtil.isEmpty(cert.getCompileId())) {
cert.setCrlFile(ConfigDictUtils.getTrustedCrlByCerId(cert.getCompileId()));
cert.setBuiltInExp(prop.getProperty(cert.getBuiltIn()==0?"no":"yes"));
}
}
titleList.add(entity.getMenuNameCode());