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 fa9e45fa3..312f27afa 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -162,8 +162,8 @@ AND r.is_audit =1 - - AND r.cfg_type =#{cfgType,jdbcType=VARCHAR} + + 'end-entity']]> AND r.CFG_ID=#{cfgId,jdbcType=BIGINT} diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index 7ad1a07ed..6d80151b2 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import com.nis.domain.Page; import com.nis.domain.configuration.AreaIpCfg; +import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.InterceptPktBin; @@ -283,7 +284,14 @@ public class InterceptCfgService extends CrudService if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){ doaminFlag=true; domainUserRegion=Constants.USERREGION_DOMAIN_ID+"="+entity.getCompileId(); - domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+entity.getHttpUrlList().get(0).getCfgKeywords(); + String domainStr=""; + if(entity != null && entity.getHttpUrlList() != null && entity.getHttpUrlList().size() > 0){ + BaseStringCfg httpUrl= entity.getHttpUrlList().get(0); + domainStr=httpUrl.getCfgKeywords(); + } + //entity.getHttpUrlList().get(0).getCfgKeywords(); + + domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr; HttpUrlCfg cfg = new HttpUrlCfg(); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); cfg.setTableName(HttpUrlCfg.getTablename()); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 6e6063b83..d891e5131 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1047,7 +1047,7 @@ tunnel_desc=Tunnel Behavior Description call_external_procedures_failed=Call external procedures failed is_hex=Is HEX is_case_insenstive=Is Case-sensitive -case_senstive=Case-senstive +case_senstive=Case-sensitive case_insenstive=Case-insensitive hex=Hex not_hex=Not HEX 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 eb8e83681..f4de1daa8 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 @@ -17,10 +17,6 @@ $(function(){ $("#privateKeyFileI").on('change', function() { $("#privateKeyFileInfo").val($("#privateKeyFileI").val()); }); - switchCfgType(); - $("input[name=cfgType]").on('change', function() { - switchCfgType(); - }); switchKeyringType(); $("select[name=keyringType]").on('change', function() { switchKeyringType(); @@ -143,16 +139,6 @@ var switchKeyringType=function(){ - - - - - checked="checked"> - checked="checked"> - - - - diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index 060bfe08d..f9427c543 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -255,7 +255,6 @@ <%-- --%> - @@ -287,10 +286,6 @@ - - - - ${cfg.cfgDesc }