From dc3b8a2dea210f3d6ccfe4d7c36835bba138846f Mon Sep 17 00:00:00 2001 From: chiguangxu Date: Fri, 23 Mar 2018 11:40:06 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=BA=A2=E8=89=B2=E5=AD=97=E4=BD=93=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=E7=95=8C?= =?UTF-8?q?=E9=9D=A2checkbox=E5=B0=8F=E8=B0=83=E6=95=B4=EF=BC=8Ctreeselect?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/tags/sys/treeselect.tag | 10 +++++-- .../webapp/WEB-INF/views/sys/userForm.jsp | 28 +++++++++++++++---- .../webapp/static/global/css/components.css | 5 ++-- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index 7b58533d6..d13c06435 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -24,12 +24,18 @@ <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%> <%@ attribute name="selectDepartment" type="java.lang.String" required="false" description="不允许选择部门,自办部门,转办部门"%> <%@ attribute name="showParentName" type="java.lang.String" required="false" description="显示父类名称"%> -
+
- <%--      --%> + +
+ +
+
+ +
- " value="${systemServiceInfo.serviceId }"/> + " value="${systemServiceInfo.serviceId }" onkeyup="checkNum(this)"/>
From 0a67e7024312437de9673eba950186100616cce2 Mon Sep 17 00:00:00 2001 From: chiguangxu Date: Fri, 23 Mar 2018 14:47:37 +0800 Subject: [PATCH 03/18] =?UTF-8?q?label=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/static/global/css/components.css | 36 ++++--------------- 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index 344a19c6d..bb0b02513 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -6157,36 +6157,12 @@ Customized Bootstrap Labels h6 .label { font-size: 75%; } -/* Labels variants */ -.label-default { - background-color: #bac3d0; } - .label-default[href]:hover, .label-default[href]:focus { - background-color: #9ca8bb; } - -.label-primary { - background-color: #337ab7; } - .label-primary[href]:hover, .label-primary[href]:focus { - background-color: #286090; } - -.label-success { - background-color: #36c6d3; } - .label-success[href]:hover, .label-success[href]:focus { - background-color: #27a4b0; } - -.label-info { - background-color: #659be0; } - .label-info[href]:hover, .label-info[href]:focus { - background-color: #3a80d7; } - -.label-warning { - background-color: #F1C40F; } - .label-warning[href]:hover, .label-warning[href]:focus { - background-color: #c29d0b; } - -.label-danger { - background-color: #ed6b75; } - .label-danger[href]:hover, .label-danger[href]:focus { - background-color: #e73d4a; } +/* Labels variants */ + .label-warning { + background-color: #e6911a; } + .label-warning[href]:hover, .label-warning[href]:focus { + background-color: #c88220; } + /*** Iconic labels From 3cfe93616fb0c92c01f3dfa92e989fa8fe3041bf Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Fri, 23 Mar 2018 19:34:17 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemService/SystemServiceController.java | 9 +++++---- .../dao/systemService/SystemServiceInfoDao.xml | 2 +- .../webapp/WEB-INF/views/systemService/form.jsp | 15 +++++++++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java index de448b540..ca35ef6fb 100644 --- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java +++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java @@ -138,11 +138,12 @@ public class SystemServiceController extends BaseController { return "true"; } else { if (id != null) { - if (list.get(0).getId() == id) { - return "true"; - } else { - return "false"; + for (SystemServiceInfo info : list) { + if (info.getIsValid() == 1 && info.getId().longValue() == id.longValue()) { + return "true"; + } } + return "false"; } else { return "false"; } diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml index c9dfe4b18..a599620d7 100644 --- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml +++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml @@ -99,7 +99,7 @@
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index d7a425267..efc3aa2fd 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -4,7 +4,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index ec8061d3b..9da9b031a 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -4,7 +4,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 1bd111e9e..10860cc04 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -14,9 +14,6 @@ $(function(){ }); $("#cfgFrom").validate({ rules: { - 'cfgDesc':{ - required:true - }, 'keywords':{ required:true }, @@ -34,9 +31,6 @@ $(function(){ } }, messages: { - 'cfgDesc':{ - required:'' - }, 'keywords':{ required:'' }, diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 7173e0660..72b2c4580 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -109,7 +109,7 @@
--%>
- +
@@ -248,7 +248,7 @@ - + <%-- --%> @@ -271,7 +271,7 @@ - + <%-- --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp index 121e8a4db..dff2b7e1f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -62,9 +62,6 @@ $(function(){ }); $("#ipCfgFrom").validate({ rules: { - cfgDesc: { - required: true, - }, ipType: { required: true, }, @@ -114,9 +111,6 @@ $(function(){ }, messages: { - cfgDesc: { - required: '', - }, ipType: { required: '', }, diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp index d6eaabefe..69d043ec3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -153,7 +153,7 @@
- +
@@ -300,7 +300,7 @@
${status.index+1 }${status.index+1 }${cfg.cfgDesc }${cfg.district }${cfg.keywords }
- + <%-- --%> @@ -343,7 +343,7 @@ - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp index aa68243c1..ee70af6ea 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp @@ -7,9 +7,6 @@ $(function(){ $("#cfgFrom").validate({ rules: { - 'cfgDesc':{ - required:true - }, 'cfgKeywords':{ required:true }, @@ -33,9 +30,6 @@ $(function(){ } }, messages: { - 'cfgDesc':{ - required:'' - }, 'cfgKeywords':{ required:'' }, diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp index ff409f0a3..997b99ebe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp @@ -110,7 +110,7 @@ --%>
- +
@@ -257,7 +257,7 @@
ip
${status.index+1 }${status.index+1 }${ipCfg.cfgDesc } V${ipCfg.ipType } ${ipCfg.srcIp }
- + <%-- --%> @@ -286,7 +286,7 @@ - + <%-- --%>
${status.index+1 }${status.index+1 }${cfg.cfgDesc } ${cfg.cfgKeywords } From 51b00dc3f29d92ac2232020d8a4a14cc8ee8707d Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 26 Mar 2018 15:53:10 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 41 +++++++++++++++++++ .../resources/messages/message_ru.properties | 41 +++++++++++++++++++ .../messages/message_zh_CN.properties | 31 ++++++++++++++ 3 files changed, 113 insertions(+) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 79f2a8f02..6cc99425c 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -96,6 +96,47 @@ sysService_manage=system service manage service_manage=service type manage system_service_manage=system service type manage specific_service_cfg=specific service cfg +features_area=features area +attribute_manage=attribute manage +isp_manage=isp manage +feature_scope_manage=feature scope manage +plaintext_manage=plaintext manage +ip_multiple_control=ip multiple control +ip_port_control=ip port control +website_multiple_control=website multiple control +mail_multiple_control=mail multiple control +request_header_control=request header control +plaintext_monitor=plaintext monitor +ip_address_monitor=ip address monitor +ip_port_monitor=ip port monitor +domain_monitor=domain monitor +dns_monitor=dns monitor +dns_response_monitor=dns response monitor +website_monite=website monite +host_monitor=host monitor +url_monitor=url monitor +website_keyword_monitor=website keyword monitor +mail_monitor=mail monitor +recipient_monitor=recipient monitor +sender_monitor=sender monitor +subject_monitor=subject monitor +mail_keyword_monitor=mail keyword monitor +mail_attachment_name_monitor=mail attachment name monitor +specific_service_cfg=specific service cfg +mail_attachment_content_monitor=mail attachment content monitor +file_transfer_monitor=file transfer monitor +ftp_address_monitor=ftp address monitor +encryption_monitor=encryption monitor +tunnel_protocol_monitor=tunnel protocol monitor +pptp_ip_monitor=pptp ip monitor +l2tp_ip_monitor=l2tp ip monitor +ssh_monitor=ssh monitor +ssl_monitor=ssl monitor +ssl_feature_monitor=ssl feature monitor +ssl_sni_monitor=ssl sni monitor +ssl_address_monitor=ssl address monitor +specific_service_host_cfg=specific service host cfg + #============menu end====================== #============yewu begin====================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index abebceb7a..5732758e2 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -96,6 +96,47 @@ sysService_manage=system service manage service_manage=service type manage system_service_manage=system service type manage specific_service_cfg=specific service cfg +features_area=features area +attribute_manage=attribute manage +isp_manage=isp manage +feature_scope_manage=feature scope manage +plaintext_manage=plaintext manage +ip_multiple_control=ip multiple control +ip_port_control=ip port control +website_multiple_control=website multiple control +mail_multiple_control=mail multiple control +request_header_control=request header control +plaintext_monitor=plaintext monitor +ip_address_monitor=ip address monitor +ip_port_monitor=ip port monitor +domain_monitor=domain monitor +dns_monitor=dns monitor +dns_response_monitor=dns response monitor +website_monite=website monite +host_monitor=host monitor +url_monitor=url monitor +website_keyword_monitor=website keyword monitor +mail_monitor=mail monitor +recipient_monitor=recipient monitor +sender_monitor=sender monitor +subject_monitor=subject monitor +mail_keyword_monitor=mail keyword monitor +mail_attachment_name_monitor=mail attachment name monitor +specific_service_cfg=specific service cfg +mail_attachment_content_monitor=mail attachment content monitor +file_transfer_monitor=file transfer monitor +ftp_address_monitor=ftp address monitor +encryption_monitor=encryption monitor +tunnel_protocol_monitor=tunnel protocol monitor +pptp_ip_monitor=pptp ip monitor +l2tp_ip_monitor=l2tp ip monitor +ssh_monitor=ssh monitor +ssl_monitor=ssl monitor +ssl_feature_monitor=ssl feature monitor +ssl_sni_monitor=ssl sni monitor +ssl_address_monitor=ssl address monitor +specific_service_host_cfg=specific service host cfg + #============menu end====================== #============yewu begin====================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 0988255a7..dbd4488c0 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -96,6 +96,37 @@ sysService_manage=\u7cfb\u7edf\u4e1a\u52a1\u7ba1\u7406 service_manage=\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406 system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406 specific_service_cfg=\u7279\u5b9a\u670d\u52a1\u7ba1\u7406 +request_header_control=\u8bf7\u6c42\u5934\u57df\u7ba1\u63a7 +plaintext_monitor=\u660e\u6587\u5185\u5bb9\u76d1\u6d4b +ip_address_monitor=IP\u5730\u5740\u76d1\u6d4b +ip_port_monitor=IP+\u7aef\u53e3\u76d1\u6d4b +domain_monitor=\u57df\u540d\u76d1\u6d4b +dns_monitor=DNS\u76d1\u6d4b +dns_response_monitor=DNS\u5e94\u7b54\u76d1\u6d4b +website_monite=\u7f51\u7ad9\u76d1\u6d4b +host_monitor=HOST\u76d1\u6d4b +url_monitor=URL\u76d1\u6d4b +website_keyword_monitor=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u76d1\u6d4b +mail_monitor=\u90ae\u4ef6\u76d1\u6d4b +recipient_monitor=\u6536\u4ef6\u4eba\u76d1\u6d4b +sender_monitor=\u53d1\u4ef6\u4eba\u76d1\u6d4b +subject_monitor=\u4e3b\u9898\u76d1\u6d4b +mail_keyword_monitor=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u76d1\u6d4b +mail_attachment_name_monitor=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u76d1\u6d4b +mail_attachment_content_monitor=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u76d1\u6d4b +file_transfer_monitor=\u6587\u4ef6\u4f20\u8f93\u76d1\u6d4b +ftp_address_monitor=FTP\u5730\u5740\u76d1\u6d4b +encryption_monitor=\u52a0\u5bc6\u5185\u5bb9\u76d1\u6d4b +tunnel_protocol_monitor=\u96a7\u9053\u534f\u8bae\u76d1\u6d4b +pptp_ip_monitor=PPTP\u534f\u8bae\u76d1\u6d4b +l2tp_ip_monitor=L2TP\u534f\u8bae\u76d1\u6d4b +ssh_monitor=SSH\u76d1\u6d4b +ssl_monitor=SSL\u76d1\u6d4b +ssl_feature_monitor=SSL\u8bc1\u4e66\u7279\u5f81\u76d1\u6d4b +ssl_sni_monitor=SSL\uff08SNI\uff09\u76d1\u6d4b +ssl_address_monitor=SSL\u5730\u5740\u76d1\u6d4b +specific_service_host_cfg=\u7279\u5b9a\u670d\u52a1\u670d\u52a1\u5668IP\u7ba1\u7406 + #==========menu end===================== #==========yewu zidian begin===================== From 1736858c4e19f4f3389e835e14ee8bb1a6860938 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Mon, 26 Mar 2018 16:07:25 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E5=AF=B9=E7=B3=BB=E7=BB=9F=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE=E3=80=81=E6=AC=BA=E9=AA=97id?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=9B=BD=E9=99=85=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/configuration/DnsIpCfgController.java | 10 +++++----- .../systemService/SystemServiceController.java | 8 ++++---- src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java index fe0c5e014..2c25787a5 100644 --- a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java @@ -66,10 +66,10 @@ public class DnsIpCfgController extends BaseController { try { dnsIpCfgService.save(dnsIpCfg); - addMessage(redirectAttributes, "保存成功"); + addMessage(redirectAttributes, "save_success"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "保存失败:" + e.getMessage()); + addMessage(redirectAttributes, "save_failed"); } return "redirect:" + adminPath + "/cfg/dnsIp/list"; @@ -82,13 +82,13 @@ public class DnsIpCfgController extends BaseController { if (!StringUtils.isEmpty(cfgIds)) { try { dnsIpCfgService.delete(cfgIds); - addMessage(model, "删除成功"); + addMessage(model, "delete_success"); } catch (Exception e) { logger.error("删除失败", e); - addMessage(model, "删除失败"); + addMessage(model, "delete_failed"); } } else { - addMessage(model, "删除失败"); + addMessage(model, "delete_failed"); } Page page = dnsIpCfgService.findPage(new Page(request, response, 30), dnsIpCfg); diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java index ca35ef6fb..0bf3d1000 100644 --- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java +++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java @@ -105,9 +105,9 @@ public class SystemServiceController extends BaseController { try { systemServiceService.save(systemServiceInfo, insertServiceConfigInfoList, updateServiceConfigInfoList); - addMessage(redirectAttributes, "保存成功"); + addMessage(redirectAttributes, "save_success"); } catch (Exception e) { - addMessage(redirectAttributes, "保存失败：" + e.getMessage()); + addMessage(redirectAttributes, "save_failed"); e.printStackTrace(); } @@ -122,9 +122,9 @@ public class SystemServiceController extends BaseController { systemServiceInfo.setIsValid(1); Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); model.addAttribute("page", page); - addMessage(model, "删除成功"); + addMessage(model, "delete_success"); } catch (Exception e) { - addMessage(model, "删除失败：" + e.getMessage()); + addMessage(model, "delete_failed"); e.printStackTrace(); } return "/systemService/list"; diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 9f263cbbb..dfc121724 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -121,7 +121,7 @@
- +
From fed87773214ae97dd50d06b53d0a88beb86f2b72 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Mon, 26 Mar 2018 17:34:07 +0800 Subject: [PATCH 10/18] =?UTF-8?q?ip=E3=80=81=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/dao/configuration/IpCfgDao.xml | 4 ++-- .../webapp/WEB-INF/views/cfg/complexCfgList.jsp | 17 +++++++++++++++-- src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp | 17 ++++++++++++++--- .../webapp/WEB-INF/views/cfg/stringCfgList.jsp | 17 +++++++++++++++-- .../webapp/WEB-INF/views/systemService/list.jsp | 2 +- 5 files changed, 47 insertions(+), 10 deletions(-) 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 ed3b9c847..70ff708a0 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -291,7 +291,7 @@ AND ${page.alias}.IP_TYPE=#{ipType,jdbcType=INTEGER} - AND ${page.alias}.SRC_IP=#{srcIp,jdbcType=VARCHAR} + AND ${page.alias}.SRC_IP like concat('%', #{srcIp,jdbcType=VARCHAR}, '%') AND ${page.alias}.SRC_IP_MASK=#{srcIpMask,jdbcType=VARCHAR} @@ -303,7 +303,7 @@ AND ${page.alias}.SRC_PORT_MASK=#{srcPortMask,jdbcType=VARCHAR} - AND ${page.alias}.DST_IP=#{dstIp,jdbcType=VARCHAR} + AND ${page.alias}.DST_IP like concat('%', #{dstIp,jdbcType=VARCHAR}, '%') AND ${page.alias}.DST_IP_MASK=#{dstIpMask,jdbcType=VARCHAR} diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 72b2c4580..acbe4e82a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -5,6 +5,17 @@ <spring:message code="${cfgName}"></spring:message>