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

修复可信证书Buil-In字段的导出

Browse Source
This commit is contained in:
wangwei
2019-06-10 18:25:17 +08:00
parent 66b3673bce
commit 7dc9e4ac43
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java
View File

@@ -20,9 +20,16 @@ public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
private String certFile; private String certFile;
@ExcelField(title="crl_file",sort=4) @ExcelField(title="crl_file",sort=4)
private String crlFile; private String crlFile;
@ExcelField(title="built_in",sort=4)//是否内置证书 private Integer builtIn;//是否内置证书
private Integer builtIn; @ExcelField(title="built_in",sort=5)//是否内置证书(导出用)
private String builtInExp;
public String getBuiltInExp() {
return builtInExp;
}
public void setBuiltInExp(String builtInExp) {
this.builtInExp = builtInExp;
}
public String getCrlFile() { public String getCrlFile() {
return crlFile; return crlFile;
} }

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); Page<PxyObjTrustedCaCert> page = pxyObjKeyringService.findTrustedCertPage(pageInfo, entity);
ipLists = page.getList(); ipLists = page.getList();
} }
Properties prop = getMsgProp();
for (PxyObjTrustedCaCert cert : ipLists) { for (PxyObjTrustedCaCert cert : ipLists) {
if (!StringUtil.isEmpty(cert.getCompileId())) { if (!StringUtil.isEmpty(cert.getCompileId())) {
cert.setCrlFile(ConfigDictUtils.getTrustedCrlByCerId(cert.getCompileId())); cert.setCrlFile(ConfigDictUtils.getTrustedCrlByCerId(cert.getCompileId()));
cert.setBuiltInExp(prop.getProperty(cert.getBuiltIn()==0?"no":"yes"));
} }
} }
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());