diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 67b0667a8..46ccdc618 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -266,6 +266,9 @@ public class ExportExcel { commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n"; index++; //1、非空 + commentStr=commentStr+"▶"+msgProp.getProperty("https_url_format_tip")+"\n"; + index++; + //1、非空 commentStr=commentStr+"▶"+msgProp.getProperty("required")+"\n"; index++; } diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index 8f27b6fb1..031aa6dd5 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -145,9 +145,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index f45aeceab..85164fbd5 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -744,9 +744,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - @@ -957,9 +955,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - @@ -1103,9 +1099,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - @@ -1221,9 +1215,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - @@ -1359,9 +1351,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - @@ -1694,9 +1684,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml index 992ca5781..6c8ce76e4 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml @@ -290,9 +290,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index 233640087..cbedc6543 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -145,9 +145,7 @@ - AND a.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index cedf5f822..db84ddd70 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -327,9 +327,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml index 0bba48b35..6056463c7 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -225,9 +225,7 @@ - AND a.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index 90ef19a1d..11bc99fbc 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -236,9 +236,7 @@ - AND a.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml index ecaf5c51e..213db07db 100644 --- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml @@ -134,9 +134,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index 3f3ff568b..ed49e9ce8 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -137,9 +137,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index 466202205..a1c7c227f 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -102,9 +102,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index efe40c659..5513d42fb 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -249,9 +249,7 @@ - AND a.IS_AUDIT in(${batchAuditValue}) - @@ -1181,9 +1179,7 @@ - AND a.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 17179b2b2..127cac089 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -1115,9 +1115,7 @@ - - AND a.IS_AUDIT in(${batchAuditValue}) - + AND a.IS_AUDIT in(${batchAuditValue}) 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 e2c0556d1..5675c1d4e 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -188,9 +188,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - @@ -289,9 +287,7 @@ - AND r.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml index 849a15a73..9e1a0af23 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -206,9 +206,7 @@ - AND a.IS_AUDIT in(${batchAuditValue}) - diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 5af47dc58..1bc42a14f 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1527,3 +1527,4 @@ url_group_manage=URL Group Manage range_cross=Found intersections between Server IP address and Client IP address app_ip_correlation=APP IP Correlation public_private_file_error=Public-private key mismatch +https_url_format_tip=URL(http[s]://xxx.xx) \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 35d60b5f8..7d0b0e017 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1529,4 +1529,5 @@ old_asn_group_manage=ASN Group url_group_manage=URL Group Manage range_cross=\u041d\u0430\u0439\u0434\u0435\u043d\u044b \u043f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u044f \u043c\u0435\u0436\u0434\u0443 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0438 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u043a\u043b\u0438\u0435\u043d\u0442\u0430 app_ip_correlation=\u041a\u043e\u0440\u0440\u0435\u043b\u044f\u0446\u0438\u044f ip-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 -public_private_file_error=\u041d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e-\u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0433\u043e \u043a\u043b\u044e\u0447\u0430. \ No newline at end of file +public_private_file_error=\u041d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e-\u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0433\u043e \u043a\u043b\u044e\u0447\u0430. +https_url_format_tip=URL(http[s]://xxx.xx) \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 2c6948410..48545390e 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1527,4 +1527,5 @@ old_asn_group_manage=ASN \u5206\u7ec4 url_group_manage=URL \u5206\u7ec4 \u7ba1\u7406 range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9 app_ip_correlation=APP\u5173\u8054\u7279\u5F81IP\u914D\u7F6E -public_private_file_error=\u516C\u79C1\u94A5\u8BC1\u4E66\u4E0D\u5339\u914D \ No newline at end of file +public_private_file_error=\u516C\u79C1\u94A5\u8BC1\u4E66\u4E0D\u5339\u914D +https_url_format_tip=URL(http[s]://xxx.xx) \ No newline at end of file