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

expireAfter从 form表单，列表界面,导出Excel，审核下发去掉（隐藏）

Browse Source
This commit is contained in:
wangxin
2019-07-19 10:31:58 +08:00
parent 7949dc7da5
commit 12a77173ca
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/callback/ProxyObjKeyring.java
View File

@@ -26,7 +26,7 @@ public class ProxyObjKeyring {
private String privateKeyFile; private String privateKeyFile;
@Expose @Expose
private String publicKeyFile; private String publicKeyFile;
@Expose //@Expose
private Integer expireAfter; private Integer expireAfter;
@Expose @Expose
private String publicKeyAlgo; private String publicKeyAlgo;

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

@@ -231,7 +231,6 @@ public class PxyObjKeyringController extends BaseController {
ResponseData data = result.getData(); ResponseData data = result.getData();
publicKeyFileAccessUrl = data.getAccessUrl(); publicKeyFileAccessUrl = data.getAccessUrl();
cfg.setPublicKeyFile(publicKeyFileAccessUrl); cfg.setPublicKeyFile(publicKeyFileAccessUrl);
;
} }
} }
if (privateKeyFileI != null) { if (privateKeyFileI != null) {
@@ -510,7 +509,7 @@ public class PxyObjKeyringController extends BaseController {
} }
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), PxyObjKeyring.class); classMap.put(entity.getMenuNameCode(), PxyObjKeyring.class);
String cfgIndexInfoNoExport = ",config_describe,whether_area_block,block_type,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String cfgIndexInfoNoExport = ",expire_after,config_describe,whether_area_block,block_type,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
// 时间过滤 // 时间过滤
if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {

6
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
View File

@@ -96,12 +96,12 @@ var switchKeyringType=function(){
if(keyringType =='end-entity'){ //实体证书不允许输入，并且默认0 if(keyringType =='end-entity'){ //实体证书不允许输入，并且默认0
$("input[name=expireAfter]").val(0); $("input[name=expireAfter]").val(0);
$(".expireAfter").addClass("hidden"); //$(".expireAfter").addClass("hidden");
}else{ }else{
if(expireAfter == ''){ if(expireAfter == ''){
$("input[name=expireAfter]").val(30); $("input[name=expireAfter]").val(30);
} }
$(".expireAfter").removeClass("hidden"); //$(".expireAfter").removeClass("hidden");
} }
} }
@@ -335,7 +335,7 @@ function privateFileValidate(){
</div> </div>
</div> </div>
<div class="row "> <div class="row ">
<div class="col-md-6 expireAfter"> <div class="col-md-6 expireAfter hidden">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="expire_after"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expire_after"/></label>
<div class="col-md-6"> <div class="col-md-6">

4
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
View File

@@ -313,7 +313,7 @@
<th column="keyring_type" ><spring:message code="keyring_type"/></th> <th column="keyring_type" ><spring:message code="keyring_type"/></th>
<th column="private_key_file" ><spring:message code="private_key_file"/></th> <th column="private_key_file" ><spring:message code="private_key_file"/></th>
<th column="public_key_file" ><spring:message code="public_key_file"/></th> <th column="public_key_file" ><spring:message code="public_key_file"/></th>
<th column="expire_after" ><spring:message code="expire_after"/></th> <%--<th column="expire_after" ><spring:message code="expire_after"/></th>--%>
<th column="CRL" ><spring:message code="CRL"/></th> <th column="CRL" ><spring:message code="CRL"/></th>
<th column="issuer" ><spring:message code="issuer"/></th> <th column="issuer" ><spring:message code="issuer"/></th>
<th column="certificate_subject" ><spring:message code="certificate_subject"/></th> <th column="certificate_subject" ><spring:message code="certificate_subject"/></th>
@@ -362,7 +362,7 @@
${fn:substring(cfg.publicKeyFile,0,20) } ${fn:substring(cfg.publicKeyFile,0,20) }
</a> </a>
</td> </td>
<td>${cfg.expireAfter }</td> <%--<td>${cfg.expireAfter }</td>--%>
<td> <td>
<a href="${cfg.crl }" target="_blank" data-original-title="${cfg.crl }" <a href="${cfg.crl }" target="_blank" data-original-title="${cfg.crl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top"> class="tooltips" data-flag="false" data-html="true" data-placement="top">