gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HTTPS重定向，导入增加httpsURL提示；

Browse Source 
解决批量删除会删除审核未通过的配置BUG
This commit is contained in:
duandongmei
2019-05-10 18:31:27 +08:00
parent b4f9eac0d3
commit ea456f83d0
18 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -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++;
}

2
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
View File

@@ -145,9 +145,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

12
src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
View File

@@ -744,9 +744,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">
@@ -957,9 +955,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">
@@ -1103,9 +1099,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">
@@ -1221,9 +1215,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">
@@ -1359,9 +1351,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">
@@ -1694,9 +1684,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
View File

@@ -290,9 +290,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -145,9 +145,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND a.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -327,9 +327,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
View File

@@ -225,9 +225,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND a.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -236,9 +236,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND a.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml
View File

@@ -134,9 +134,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
View File

@@ -137,9 +137,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
View File

@@ -102,9 +102,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

4
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -249,9 +249,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND a.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">
@@ -1181,9 +1179,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND a.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

4
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -1115,9 +1115,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND a.IS_AUDIT in(${batchAuditValue})
</if>
AND a.IS_AUDIT in(${batchAuditValue})
</when>
<otherwise>
<if test="isAudit != null">

4
src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
View File

@@ -188,9 +188,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">
@@ -289,9 +287,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND r.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

2
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -206,9 +206,7 @@
<choose>
<!-- 判断是否批量操作 -->
<when test="batchAuditValue != null and batchAuditValue != ''">
<if test="isAudit != null">
AND a.IS_AUDIT in(${batchAuditValue})
</if>
</when>
<otherwise>
<if test="isAudit != null">

1
src/main/resources/messages/message_en.properties
View File

@@ -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)

3
src/main/resources/messages/message_ru.properties
View File

@@ -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.
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)

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -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
public_private_file_error=\u516C\u79C1\u94A5\u8BC1\u4E66\u4E0D\u5339\u914D
https_url_format_tip=URL(http[s]://xxx.xx)