diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java index 6654b272d..d86651de7 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java @@ -35,6 +35,7 @@ import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.PxyObjKeyring; +import com.nis.domain.configuration.PxyObjSpoofingIpPool; import com.nis.domain.configuration.PxyObjTrustedCaCert; import com.nis.domain.configuration.PxyObjTrustedCaCrl; import com.nis.domain.configuration.WebsiteDomainTopic; @@ -88,6 +89,7 @@ public interface ConfigSynchronizationDao { public List getDnsIpCfgList(BaseCfg entity); public List getIpPortListByService(BaseCfg entity); public List getIpDropList(@Param("tableName")String tableName,@Param("compileIds")List compileIds); + List getSpoofingIpPoolList(BaseCfg entity); public List getAppPolicyList(BaseCfg entity); public List getAppFeatureIndexList(BaseCfg entity); diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml index d18cf1531..8325e5c9c 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml @@ -877,6 +877,13 @@ a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port ,a.protocol,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id + + a.CFG_ID, a.CFG_DESC,a.CFG_REGION_CODE, a.IP_TYPE, a.IP_ADDRESS, + a.DIRECTION,a.PROTOCOL,a.IS_VALID,a.IS_AUDIT,a.location,a.port, + a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, + a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, + a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.FUNCTION_ID,a.GROUP_ID,a.user_region + - + - + + + + + + + + + + - + - + + @@ -255,29 +266,34 @@ + + + + + @@ -285,18 +301,21 @@ + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index b82bd83a0..8829dda91 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -31,7 +31,13 @@ $(document).ready(function(){

- + + + + + + +

diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index f0ff3b606..7cc411d01 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -227,6 +227,7 @@ URL         + @@ -237,11 +238,11 @@ - - + <%-- + --%> <%-- --%> - + @@ -254,11 +255,11 @@ - - + <%-- + --%> - + <%-- --%> @@ -308,6 +309,7 @@ http://${log.url} --%> + ${log.website } ${log.reqLine } ${log.resLine } @@ -318,9 +320,9 @@ ${log.contentLen } ${log.contentType } ${log.setCookie } - ${log.reqHeader } - ${log.respHeader } - ${log.website } + <%-- ${log.reqHeader } + ${log.respHeader } --%> + ${fns:abbr(log.capIp, 42)} @@ -381,8 +383,8 @@ - ${log.innerSmac } - ${log.innerDmac } + <%-- ${log.innerSmac } + ${log.innerDmac } --%> ${log.streamDir } @@ -393,7 +395,7 @@ - ${log.addrList } + <%-- ${log.addrList } --%> ${log.serverLocate} ${log.clientLocate} ${log.sAsn}