diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index f4cd1c8c0..4667a679e 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -601,7 +601,7 @@ public class ExportExcel { if(((","+region.getConfigHex()+",").indexOf(",1,") >-1)){ for (SysDataDictionaryItem sysDataDictionaryItem : isHex) { if(sysDataDictionaryItem.getItemCode().equals("1")){ - commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+sysDataDictionaryItem.getItemValue()+")"+"\n"; + commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+")"+"\n"; index++; } } @@ -609,7 +609,7 @@ public class ExportExcel { if(!((","+region.getConfigHex()+",").indexOf(",1,") >-1)){ for (SysDataDictionaryItem sysDataDictionaryItem : isHex) { if(sysDataDictionaryItem.getItemCode().equals("0")){ - commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+sysDataDictionaryItem.getItemValue()+")"+"\n"; + commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+")"+"\n"; index++; } } @@ -636,7 +636,7 @@ public class ExportExcel { if(((","+region.getConfigHex()+",").indexOf(",2,") >-1)){ for (SysDataDictionaryItem sysDataDictionaryItem : isCaseSenstive) { if(sysDataDictionaryItem.getItemCode().equals("1")){ - commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+sysDataDictionaryItem.getItemValue()+")"+"\n"; + commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+")"+"\n"; index++; } } @@ -644,7 +644,7 @@ public class ExportExcel { if(!((","+region.getConfigHex()+",").indexOf(",2,") >-1)){ for (SysDataDictionaryItem sysDataDictionaryItem : isCaseSenstive) { if(sysDataDictionaryItem.getItemCode().equals("0")){ - commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+sysDataDictionaryItem.getItemValue()+")"+"\n"; + commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"("+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+")"+"\n"; index++; } } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 1d3c9088a..c4c50fb6c 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -505,7 +505,7 @@ ipv4_default_ip_value=0.0.0.0 ipv6_default_ip_value=\:\: ipv4_default_ip_subnet_value=0.0.0.0/16 ipv6_default_ip_subnet_value=::/128 -ipv4_default_ip_range_value=192.168.10.1-2 +ipv4_default_ip_range_value=0.0.0.0-1 ipv6_default_ip_range_value=::-:: #\u7aef\u53e3\u9ed8\u8ba4\u503c port_default=0 diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 900866edf..e1a214d3d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -97,10 +97,24 @@ - + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index 9b85673d4..c4cc86d01 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -100,10 +100,24 @@ - + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index 346710bd6..d9f961f98 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -98,9 +98,23 @@ onClick="javascript:window.location='${ctx}/encryptedtunnelbehav/form?functionId=${cfg.functionId}'"> - + 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 f8b1ceb56..72b967612 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -99,8 +99,20 @@ onClick="javascript:window.location='${ctx}/proxy/intercept/intercept${interceptType}Form?functionId=${cfg.functionId}'"> - - diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index cd3c74b11..7c28b292a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -91,9 +91,23 @@ onClick="javascript:window.location='${ctx}/ntc/iplist/form?functionId=${cfg.functionId}'"> - + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index f233bb9e4..78560491b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -92,9 +92,23 @@ onClick="javascript:window.location='${ctx}/ntc/mail/mailForm?functionId=${cfg.functionId}'"> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index d76196300..0bfc81637 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -91,9 +91,23 @@ onClick="javascript:window.location='${ctx}/ntc/website/dnsForm?functionId=${cfg.functionId}'"> - + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index 5b6374f21..b2f83bbf8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -236,22 +236,23 @@ onClick="javascript:window.location='${ctx}/ntc/website/httpForm?functionId=${cfg.functionId}'"> - - - <%--
- - -
--%> + + + + + + + + + + + + + + +