diff --git a/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java b/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java index 7e12c56d6..6128c64dd 100644 --- a/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java +++ b/src/main/java/com/nis/domain/callback/ProxyObjKeyring.java @@ -26,7 +26,7 @@ public class ProxyObjKeyring { private String privateKeyFile; @Expose private String publicKeyFile; - @Expose + //@Expose private Integer expireAfter; @Expose private String publicKeyAlgo; diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 69bd8a4ca..7a77c10ae 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -231,7 +231,6 @@ public class PxyObjKeyringController extends BaseController { ResponseData data = result.getData(); publicKeyFileAccessUrl = data.getAccessUrl(); cfg.setPublicKeyFile(publicKeyFileAccessUrl); - ; } } if (privateKeyFileI != null) { @@ -510,7 +509,7 @@ public class PxyObjKeyringController extends BaseController { } titleList.add(entity.getMenuNameCode()); 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) { diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp index ae161cbf3..1c900b2b8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp @@ -96,12 +96,12 @@ var switchKeyringType=function(){ if(keyringType =='end-entity'){ //实体证书不允许输入,并且默认0 $("input[name=expireAfter]").val(0); - $(".expireAfter").addClass("hidden"); + //$(".expireAfter").addClass("hidden"); }else{ if(expireAfter == ''){ $("input[name=expireAfter]").val(30); } - $(".expireAfter").removeClass("hidden"); + //$(".expireAfter").removeClass("hidden"); } } @@ -335,7 +335,7 @@ function privateFileValidate(){