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 1048c4ccb..f4f1d1bad 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 @@ -527,13 +527,13 @@ public class InterceptController extends CommonController { pxyInterceptCfg.setCertTransparency(((Map)userregion.get("exclusions")).get("cert_transparency").toString()); } if(((Map)userregion.get("exclusions")).containsKey("ev_cert")) { - pxyInterceptCfg.setClientCertReq(((Map)userregion.get("exclusions")).get("ev_cert").toString()); + pxyInterceptCfg.setClientCertReq(((Map)userregion.get("exclusions")).get("client_cert_req").toString()); } if(((Map)userregion.get("exclusions")).containsKey("ev_cert")) { - pxyInterceptCfg.setPinning(((Map)userregion.get("exclusions")).get("ev_cert").toString()); + pxyInterceptCfg.setPinning(((Map)userregion.get("exclusions")).get("pinning").toString()); } if(((Map)userregion.get("exclusions")).containsKey("ev_cert")) { - pxyInterceptCfg.setProtocolErrors(((Map)userregion.get("exclusions")).get("ev_cert").toString()); + pxyInterceptCfg.setProtocolErrors(String.valueOf(((Map)userregion.get("exclusions")).get("protocol_errors"))); } if(((Map)((Map)userregion.get("cert_verify")).get("approach")).containsKey("cn")) { pxyInterceptCfg.setCn(((Map)((Map)userregion.get("cert_verify")).get("approach")).get("cn").toString()); @@ -544,9 +544,6 @@ public class InterceptController extends CommonController { if(((Map)((Map)userregion.get("cert_verify")).get("approach")).containsKey("self-signed")) { pxyInterceptCfg.setSelfSigned(((Map)((Map)userregion.get("cert_verify")).get("approach")).get("self-signed").toString()); } - if(((Map)((Map)userregion.get("cert_verify")).get("approach")).containsKey("expiration")) { - pxyInterceptCfg.setSelfSigned(((Map)((Map)userregion.get("cert_verify")).get("approach")).get("expiration").toString()); - } if(((Map)((Map)userregion.get("cert_verify")).get("approach")).containsKey("expiration")) { pxyInterceptCfg.setExpiration(((Map)((Map)userregion.get("cert_verify")).get("approach")).get("expiration").toString()); } @@ -672,7 +669,7 @@ public class InterceptController extends CommonController { dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList); } else if (entity.getFunctionId() == 200) {// IP拦截 - cfgIndexInfoNoExport = ",total_log,userRegion1,userRegion5,do_log,policy_name,group_name,userregion3,userregion4,block_type,&userregion2:ratelimit-userregion5:block_type"; + cfgIndexInfoNoExport = ",log_total,userRegion1,userRegion5,do_log,policy_name,group_name,userregion3,userregion4,block_type,&userregion2:ratelimit-userregion5:block_type"; titleList.add("PXY_INTERCEPT_IP"); classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class); noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport); 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 7e65a227a..8a73a864f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -452,7 +452,7 @@ - + <%-- --%> <%-- --%> <%-- --%> @@ -545,7 +545,7 @@ - + <%-- @@ -553,7 +553,7 @@ - + --%> <%-- ${indexCfg.userRegion3 }