diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java index dac66b298..0a8616cc7 100644 --- a/src/main/java/com/nis/util/ConfigConvertUtil.java +++ b/src/main/java/com/nis/util/ConfigConvertUtil.java @@ -830,7 +830,7 @@ public class ConfigConvertUtil { }else if(serviceId.equals(512)){ if(userRegionMap.isEmpty()){ //keyring - userRegionMap.put("keyring", 0); + userRegionMap.put("keyring", 1); Map map = new HashMap(); //exclusions map.put("ev_cert", 0); diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java index 5007beb8f..620563058 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -603,7 +603,7 @@ public class CheckIpFormatThread implements Callable{ prop.getProperty("pxy_intercept_monit_keyring") + " ") + ";"); } }else { - userRegionMap.put("keyring", 0); + userRegionMap.put("keyring", 1); } if(evCet!=null) { if(evCet!=0&&evCet!=1) { diff --git a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java index 599cb2014..72b34b5bb 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -549,7 +549,7 @@ public class CheckStringFormatThread implements Callable{ prop.getProperty("pxy_intercept_monit_keyring") + " ") + ";"); } }else { - userRegionMap.put("keyring", 0); + userRegionMap.put("keyring", 1); } if(evCet!=null) { if(evCet!=0&&evCet!=1) { diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 502c7d3e4..8443e1da3 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -133,7 +133,7 @@ public class InterceptController extends CommonController { if(StringUtils.isNotBlank(keyring)) { entity.getUserRegion().put("keyring", Long.parseLong(keyring)); }else { - entity.getUserRegion().put("keyring", 0); + entity.getUserRegion().put("keyring", 1); } Map map = new HashMap(); //exclusions diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index 066831f04..ddf4a0c78 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -395,7 +395,7 @@ 'end-entity']]> - AND r.COMPILE_ID in(#{compileIds}) + AND r.COMPILE_ID in(${compileIds}) diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 86a8fa3b3..e97a7da4d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -96,11 +96,8 @@ if(userregion.length>0&&userregion.indexOf("{")==0){ var jsonObj=JSON.parse(userregion); var obj=$(this); - $(obj).parent().find("td[data-column='keyring']").text(jsonObj.keyring==0?"":jsonObj.keyring); - if(jsonObj.keyring){ - keyringArr.push(jsonObj.keyring); - } - + $(obj).parent().find("td[data-column='keyring']").text(jsonObj.keyring); + keyringArr.push(jsonObj.keyring); $(obj).parent().find("td[data-column='ev_cert']").text(jsonObj.exclusions.ev_cert==1?"":""); $(obj).parent().find("td[data-column='cert_transparency']").text(jsonObj.exclusions.cert_transparency==1?"":""); $(obj).parent().find("td[data-column='client_cert_req']").text(jsonObj.exclusions.client_cert_req==1?"":"");