From c2f959fd3c93f9a35c8e9abda320e464b5226621 Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Tue, 13 Mar 2018 13:01:00 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=86=B2=E7=AA=81=20=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 111 ++++++++++-------- .../resources/messages/message_ru.properties | 108 ++++++++++------- .../basics/serviceDictInfoSearchList.jsp | 11 +- .../views/basics/sysDictInfoSearchList.jsp | 9 +- 4 files changed, 143 insertions(+), 96 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index eea83a3c6..4b28c1942 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -28,67 +28,67 @@ text_monitor=text monitor text_enhance_manage=text enhance manage text_enhance_monitor=text enhance monitor plaintext_manage=plaintext manage -monitor_white=monitor white -ip_monitor_white=ip monitor white -monitor_grey=monitor grey +control_white=control white +ip_control_white=ip control white +control_grey=control grey social_app_grey=social app grey -encryption_monitor=encryption monitor -specific_agreement_monitor=specific agreement monitor -social_app_monitor=social app monitor -online_media_monitor=online media monitor -sip_ip_monitor=sip ip monitor -domain_monitor_white=domain monitor white -ip_address_monitor=ip address monitor -ip_monitor=ip monitor -ip_port_monitor=ip port monitor -domain_monitor=domain monitor -dns_monitor=dns monitor +encryption_control=encryption control +specific_agreement_control=specific agreement control +social_app_control=social app control +online_media_control=online media control +sip_ip_control=sip ip control +domain_control_white=domain control white +ip_address_control=ip address control +ip_control=ip control +ip_port_control=ip port control +domain_control=domain control +dns_control=dns control basic_configuration=basic configuration letter_from=letter from classification=classification -classification_manage=classification_manage -attribute_manage=attribute_manage -area_manage=area_manage -isp_manage=isp_manage -feature_scope_manage=feature_scope_manage +classification_manage=classification manage +attribute_manage=attribute manage +area_manage=area manage +isp_manage=isp manage +feature_scope_manage=feature scope manage special_tasks=special tasks label_manage=label manage protect_list=protect list effect_range=effect range agreement_ip_configuration=agreement ip configuration ip_spoofing_configuration=ip spoofing configuration -website_monitor=website monitor -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 -theme_monitor=theme monitor -mail_keyword_monitor=mail keyword monitor -mail_attachment_name_monitor=mail attachment name monitor -mail_attachment_content_monitor=mail attachment content monitor -file_transfer_monitor=file transfer monitor -ftp_address_monitor=ftp address monitor -ftp_name_monitor=ftp name monitor -ftp_content_monitor=ftp content monitor +website_control=website control +host_control=host control +url_control=url control +website_keyword_control=website keyword control +mail_control=mail control +recipient_control=recipient control +sender_control=sender control +theme_control=theme control +mail_keyword_control=mail keyword control +mail_attachment_name_control=mail attachment name control +mail_attachment_content_control=mail attachment content control +file_transfer_control=file transfer control +ftp_address_control=ftp address control +ftp_name_control=ftp name control +ftp_content_control=ftp content control http_app_feature=http app feature ssl_app_feature=ssl app feature -tunnel_protocol_monitor=tunnel protocol monitor -l2tp_ip_monitor=l2tp ip monitor -pptp_ip_monitor=pptp ip monitor -openvpn_monitor=openvpn 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 +tunnel_protocol_control=tunnel protocol control +l2tp_ip_control=l2tp ip control +pptp_ip_control=pptp ip control +openvpn_control=openvpn control +ssh_control=ssh control +ssl_control=ssl control +ssl_feature_control=ssl feature control +ssl_sni_control=ssl sni control +ssl_address_control=ssl address control https_website_content_replace=https website content replace -https_website_monitor=https website monitor -rtp_ip_monitor=rtp ip monitor -mms_ip_monitor=mms ip monitor -rtsp_ip_monitor=rtsp ip monitor -rtmp_ip_monitor=rtmp ip monitor +https_website_control=https website control +rtp_ip_control=rtp ip control +mms_ip_control=mms ip control +rtsp_ip_control=rtsp ip control +rtmp_ip_control=rtmp ip control examine_manage=examine manage audit_manage=audit manage log_search=log search @@ -137,6 +137,10 @@ begin_date=begin date end_date=end date delete=delete special_task=special task +cancel_approved=cancel approved +task_name=task name +task_org=task organization +task_time=task time #============laihan end====================== @@ -157,6 +161,17 @@ turning_page=It is turning to the page login_timeout=No login or login timeout,please login again,Thank you! captcha_error=captcha error enter_captcha=Please enter the captcha +input=please input +input_title=please input title +all_states=all states +filter=filter +to=to +reset=reset +info=info +has_approved=It has been approved and can not be operated on ! +hasnot_approved=It has not been approved and can not be operated on ! +check_one=choose one please ! +one_more=please choose at least one ! #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index c303a4959..4b28c1942 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -28,62 +28,67 @@ text_monitor=text monitor text_enhance_manage=text enhance manage text_enhance_monitor=text enhance monitor plaintext_manage=plaintext manage -monitor_white=monitor white -ip_monitor_white=ip monitor white -monitor_grey=monitor grey +control_white=control white +ip_control_white=ip control white +control_grey=control grey social_app_grey=social app grey -encryption_monitor=encryption monitor -specific_agreement_monitor=specific agreement monitor -social_app_monitor=social app monitor -online_media_monitor=online media monitor -sip_ip_monitor=sip ip monitor -domain_monitor_white=domain monitor white -ip_address_monitor=ip address monitor -ip_monitor=ip monitor -ip_port_monitor=ip port monitor -domain_monitor=domain monitor -dns_monitor=dns monitor +encryption_control=encryption control +specific_agreement_control=specific agreement control +social_app_control=social app control +online_media_control=online media control +sip_ip_control=sip ip control +domain_control_white=domain control white +ip_address_control=ip address control +ip_control=ip control +ip_port_control=ip port control +domain_control=domain control +dns_control=dns control basic_configuration=basic configuration letter_from=letter from classification=classification +classification_manage=classification manage +attribute_manage=attribute manage +area_manage=area manage +isp_manage=isp manage +feature_scope_manage=feature scope manage special_tasks=special tasks label_manage=label manage protect_list=protect list effect_range=effect range agreement_ip_configuration=agreement ip configuration ip_spoofing_configuration=ip spoofing configuration -website_monitor=website monitor -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 -theme_monitor=theme monitor -mail_keyword_monitor=mail keyword monitor -mail_attachment_name_monitor=mail attachment name monitor -mail_attachment_content_monitor=mail attachment content monitor -file_transfer_monitor=file transfer monitor -ftp_address_monitor=ftp address monitor -ftp_name_monitor=ftp name monitor -ftp_content_monitor=ftp content monitor +website_control=website control +host_control=host control +url_control=url control +website_keyword_control=website keyword control +mail_control=mail control +recipient_control=recipient control +sender_control=sender control +theme_control=theme control +mail_keyword_control=mail keyword control +mail_attachment_name_control=mail attachment name control +mail_attachment_content_control=mail attachment content control +file_transfer_control=file transfer control +ftp_address_control=ftp address control +ftp_name_control=ftp name control +ftp_content_control=ftp content control http_app_feature=http app feature ssl_app_feature=ssl app feature -tunnel_protocol_monitor=tunnel protocol monitor -l2tp_ip_monitor=l2tp ip monitor -pptp_ip_monitor=pptp ip monitor -openvpn_monitor=openvpn 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 +tunnel_protocol_control=tunnel protocol control +l2tp_ip_control=l2tp ip control +pptp_ip_control=pptp ip control +openvpn_control=openvpn control +ssh_control=ssh control +ssl_control=ssl control +ssl_feature_control=ssl feature control +ssl_sni_control=ssl sni control +ssl_address_control=ssl address control https_website_content_replace=https website content replace -https_website_monitor=https website monitor -rtp_ip_monitor=rtp ip monitor -mms_ip_monitor=mms ip monitor -rtsp_ip_monitor=rtsp ip monitor -rtmp_ip_monitor=rtmp ip monitor +https_website_control=https website control +rtp_ip_control=rtp ip control +mms_ip_control=mms ip control +rtsp_ip_control=rtsp ip control +rtmp_ip_control=rtmp ip control examine_manage=examine manage audit_manage=audit manage log_search=log search @@ -132,11 +137,15 @@ begin_date=begin date end_date=end date delete=delete special_task=special task +cancel_approved=cancel approved +task_name=task name +task_org=task organization +task_time=task time #============laihan end====================== #==========message begin===================== -required=This field is required！ +required=This field is required\uff01 select=Please select date_list=Date List confirm_message=Are you sure? @@ -152,6 +161,17 @@ turning_page=It is turning to the page login_timeout=No login or login timeout,please login again,Thank you! captcha_error=captcha error enter_captcha=Please enter the captcha +input=please input +input_title=please input title +all_states=all states +filter=filter +to=to +reset=reset +info=info +has_approved=It has been approved and can not be operated on ! +hasnot_approved=It has not been approved and can not be operated on ! +check_one=choose one please ! +one_more=please choose at least one ! #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp index bd60d355a..38c628ca2 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp @@ -11,6 +11,7 @@ function reset(){ $("#searchForm").reset(); } + /** 处理全选、全取消 **/ @@ -68,6 +69,12 @@ return false; } $(document).ready(function() { + + //reset + $("#resetBtn").on("click",function(){ + $(".Wdate").attr("value",''); + $("#searchForm")[0].reset(); + }); //设定显示总条数 $("#showTotalCount").text('${showTotalCount}'); @@ -229,8 +236,8 @@
- - + +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp index 3ed54ae81..34d28d6d7 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp @@ -77,7 +77,12 @@ $("#intype").attr("name",$("#seltype").find("option:selected").val()); $("#intype").val('${searchContent}'); - + //reset + $("#resetBtn").on("click",function(){ + $(".Wdate").attr("value",''); + $("#searchForm")[0].reset(); + }); + //筛选功能初始化 filterActionInit(); @@ -228,7 +233,7 @@
- +
From 7dd02b090f7cf8a6163f4d9a5e2ad4c0ac40ecd4 Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Tue, 13 Mar 2018 13:02:56 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4b28c1942..422a704c8 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== \ No newline at end of file +#==========guankongbaimingdan end===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 4b28c1942..422a704c8 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== \ No newline at end of file +#==========guankongbaimingdan end===================== From b2d75cfb43b74132cafa6b38eaebc4e4d6ec9991 Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Tue, 13 Mar 2018 13:04:36 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 422a704c8..4b28c1942 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== +#==========guankongbaimingdan end===================== \ 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 422a704c8..4b28c1942 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== +#==========guankongbaimingdan end===================== \ No newline at end of file From 382e791e3bf05ffe4c1cd0ce89c3c7e55a7f9c19 Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Tue, 13 Mar 2018 13:06:30 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4b28c1942..422a704c8 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== \ No newline at end of file +#==========guankongbaimingdan end===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 4b28c1942..422a704c8 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== \ No newline at end of file +#==========guankongbaimingdan end===================== From 8451ff68b6d66b212d43e52f0c14d31097124b18 Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Tue, 13 Mar 2018 13:08:32 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 3 ++- src/main/resources/messages/message_ru.properties | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 422a704c8..65bce68f0 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1,3 +1,4 @@ + #menu and button info funMenu=function menu sysManage=system management @@ -270,4 +271,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== +#==========guankongbaimingdan end===================== \ 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 422a704c8..65bce68f0 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1,3 +1,4 @@ + #menu and button info funMenu=function menu sysManage=system management @@ -270,4 +271,4 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== +#==========guankongbaimingdan end===================== \ No newline at end of file From 3806b8d1557b57fdc8447d1138be80e269b975bb Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Tue, 13 Mar 2018 13:09:03 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 1 - src/main/resources/messages/message_ru.properties | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 65bce68f0..4b28c1942 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1,4 +1,3 @@ - #menu and button info funMenu=function menu sysManage=system management diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 65bce68f0..4b28c1942 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1,4 +1,3 @@ - #menu and button info funMenu=function menu sysManage=system management From 1d6595cdbce6d9e98bff0f7290291350ce92e30f Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 09:36:32 +0800 Subject: [PATCH 07/29] =?UTF-8?q?1=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E6=98=BE=E7=A4=BA=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BA=BA=E5=91=98=E5=8F=8A=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=8F=8A=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=89=E6=95=88=E7=8A=B6=E6=80=81=202?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/dao/configuration/RequestInfoDao.xml | 1 + .../java/com/nis/web/dao/configuration/TaskInfoDao.xml | 2 +- .../java/com/nis/web/service/basics/TaskInfoService.java | 2 ++ .../nis/web/service/configuration/RequestInfoService.java | 2 ++ src/main/resources/messages/message_en.properties | 1 + src/main/resources/messages/message_zh_CN.properties | 1 + src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp | 8 ++++++++ src/main/webapp/WEB-INF/views/cfg/requestList.jsp | 7 +++++-- 8 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index aa64cb5cb..c9e0cc0f8 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -39,6 +39,7 @@ u.name AS editorName, r.edit_time AS editTime, e.name AS currentName, + e.name AS auditorName, r.audit_time AS auditTime, t.task_name AS taskName from request_info r diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index 3e373d774..e20b2db91 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -43,7 +43,7 @@ r.create_time AS createTime, u.name AS editorName, r.edit_time AS editTime, - e.name AS currentName, + e.name AS auditorName, r.audit_time AS auditTime from task_info r left join sys_user s on r.creator_id=s.id diff --git a/src/main/java/com/nis/web/service/basics/TaskInfoService.java b/src/main/java/com/nis/web/service/basics/TaskInfoService.java index e4ebe5fb0..bf5cc2b99 100644 --- a/src/main/java/com/nis/web/service/basics/TaskInfoService.java +++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java @@ -63,6 +63,7 @@ public class TaskInfoService extends BaseService{ for (int i = 0; i < exId.length; i++) { taskInfo.setId(Long.valueOf(exId[i])); taskInfo.setIsAudit(1);//审核通过 + taskInfo.setIsValid(1);//审核通过 taskInfo.setAuditTime(new Date()); taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 taskInfoDao.update(taskInfo); @@ -85,6 +86,7 @@ public class TaskInfoService extends BaseService{ for (int i = 0; i < cancelId.length; i++) { taskInfo.setId(Long.valueOf(cancelId[i])); taskInfo.setIsAudit(3);//取消审核通过 + taskInfo.setIsValid(0); taskInfo.setAuditTime(new Date()); taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 taskInfoDao.update(taskInfo); diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java index f74bc07c5..abeb0c464 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -67,6 +67,7 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < exId.length; i++) { requestInfo.setId(Long.valueOf(exId[i])); requestInfo.setIsAudit(1);//审核通过 + requestInfo.setIsValid(1);//审核通过有效 requestInfo.setAuditTime(new Date()); requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); @@ -89,6 +90,7 @@ public class RequestInfoService extends BaseService{ for (int i = 0; i < cancelId.length; i++) { requestInfo.setId(Long.valueOf(cancelId[i])); requestInfo.setIsAudit(3);//取消审核通过 + requestInfo.setIsValid(0);//取消审核通过无效 requestInfo.setAuditTime(new Date()); requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 requestInfoDao.update(requestInfo); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 28df3e32b..bcc6a4bd4 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -172,6 +172,7 @@ has_approved=It has been approved and can not be operated on ! hasnot_approved=It has not been approved and can not be operated on ! check_one=choose one please ! one_more=please choose at least one ! +custom_columns=custom columns #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 65c370e6f..da1c36715 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -171,6 +171,7 @@ has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\ hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01 check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01 one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e! +custom_columns=\u81ea\u5b9a\u4e49\u5217\u5b57\u6bb5 #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index df9a34953..86c1e4d67 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -82,6 +82,10 @@
    • + href="javascript:;"> + + @@ -158,6 +162,8 @@ + + @@ -187,6 +193,8 @@ + ${taskInfo.auditorName } + diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 4e40a5256..cb2ac99f5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -90,7 +90,7 @@ + data-container="body" data-placement="top" data-original-title= href="javascript:;"> @@ -180,7 +180,8 @@ -<%-- --%> + + @@ -213,6 +214,8 @@ ${requestInfo.requestTitle } ${requestInfo.requestContent } ${requestInfo.taskName } + ${requestInfo.auditorName } + From 0ff05e00ffc4d0af3c5a51046b6018f88ad1a4af Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 12:17:09 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=97=B6=E6=98=BE=E7=A4=BA=E6=97=A0?= =?UTF-8?q?=E6=95=88=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/configuration/RequestInfoDao.xml | 45 ++++++++++++++----- .../nis/web/dao/configuration/TaskInfoDao.xml | 5 ++- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index c9e0cc0f8..3baa562e4 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -79,10 +79,31 @@ @@ -99,31 +120,32 @@ editor_id, edit_time, auditor_id, - audit_time + audit_time, + task_id ) values (#{requestNumber,jdbcType=VARCHAR}, #{requestOrg,jdbcType=VARCHAR}, #{requestTime,jdbcType=DATE}, #{requestTitle,jdbcType=VARCHAR}, #{requestContent,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER}, #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=DATE}, #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, - #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}) + #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}, #{taskId,jdbcType=BIGINT}) update request_info - + request_number = #{requestNumber,jdbcType=VARCHAR}, - + request_org = #{requestOrg,jdbcType=VARCHAR}, request_time = #{requestTime,jdbcType=DATE}, - + request_title = #{requestTitle,jdbcType=VARCHAR}, - + request_content = #{requestContent,jdbcType=VARCHAR}, @@ -150,6 +172,9 @@ audit_time = #{auditTime,jdbcType=DATE}, + + task_id = #{taskId}, + where id = #{id,jdbcType=BIGINT} diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index e20b2db91..d3e936cd4 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -24,9 +24,10 @@ From 47287d58a7b80cfcb32129d4d264f5e6daf72a24 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 15:26:49 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E8=AF=AD=E8=A8=80=E8=AE=BE=E7=BD=AE=E5=88=87=E6=8D=A2?= =?UTF-8?q?jbox=E4=B8=AD=E8=8B=B1=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery-jbox/2.3/jquery.jBox-2.3.src.js | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js index 944c32280..0e98b4144 100644 --- a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js +++ b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js @@ -591,16 +591,32 @@ width: 350, height: 'auto', bottomText: '', - buttons: { '确定': 'ok' }, + buttons: { 'ok': 'ok' }, buttonsFocus: 0, loaded: function (h) { }, submit: function (v, h, f) { return true; }, closed: function () { } }; - $.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } }; + //国际化切换 + var type=navigator.appName; + if(type=="Netscape"){ + var lang = navigator.language;//获取浏览器语言配置支持非IE + }else{ + var lang = navigator.userLanguage;//支持IE + } + var lang = lang.toLowerCase(); + if(lang.indexOf("zh")!=-1) { + + $.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } }; + $.jBox.languageDefaults = { close: '关闭', ok: '确定', yes: '是', no: '否', cancel: '取消' }; + }else{ + $.jBox.stateDefaults = { content: '', buttons: { 'ok': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } }; + $.jBox.languageDefaults = { close: 'close', ok: 'ok', yes: 'yes', no: 'no', cancel: 'cancel' }; + } + + $.jBox.tipDefaults = { content: '', icon: 'info', top: '40%', width: 'auto', height: 'auto', opacity: 0, timeout: 3000, closed: function () { } }; $.jBox.messagerDefaults = { content: '', title: 'jBox', icon: 'none', width: 350, height: 'auto', timeout: 3000, showType: 'slide', showSpeed: 600, border: 0, buttons: {}, buttonsFocus: 0, loaded: function () { }, submit: function (v, h, f) { return true; }, closed: function () { } }; - $.jBox.languageDefaults = { close: '关闭', ok: '确定', yes: '是', no: '否', cancel: '取消' }; $.jBox.setDefaults = function (configs) { $.jBox.defaults = $.extend({}, $.jBox.defaults, configs.defaults); From 93d7f3a9170268659333fd5324d239aeecfdc9fe Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 16 Mar 2018 18:29:53 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dao/configuration/RequestInfoDao.xml | 4 +- .../nis/web/dao/configuration/TaskInfoDao.xml | 2 +- .../messages/message_zh_CN.properties | 2 +- .../WEB-INF/views/basics/taskInfoList.jsp | 22 ++++------ .../webapp/WEB-INF/views/cfg/requestForm.jsp | 10 ----- .../webapp/WEB-INF/views/cfg/requestList.jsp | 43 ++++++++++--------- 6 files changed, 35 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 3baa562e4..71979abec 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -66,8 +66,8 @@ AND r.request_time between #{beginDate} and #{endDate} - AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate}) - + AND r.edit_time between #{dobeginDate} and #{doendDate} + order by r.request_time desc diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index d3e936cd4..683e8561a 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -62,7 +62,7 @@ AND r.task_time between #{beginDate} and #{endDate} - AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate}) + AND r.edit_time between #{dobeginDate} and #{doendDate} order by r.task_time desc diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index da1c36715..1eca25fed 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -106,7 +106,7 @@ desc=\u63cf\u8ff0\u4fe1\u606f parent_id=\u7236ID is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9 is_valid=\u6709\u6548\u6807\u5fd7 -create_time=\u914d\u7f6e\u65f6\u95f4 +create_time=\u521b\u5efa\u65f6\u95f4 edit_time=\u4fee\u6539\u65f6\u95f4 superior_config=\u4e0a\u7ea7\u914d\u7f6e config_content=\u914d\u7f6e\u5185\u5bb9 diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 86c1e4d67..ccd49bb4d 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -116,7 +116,7 @@
    - +
    - - + + + + @@ -182,17 +184,9 @@ ${taskInfo.creatorName } - - - - - - - - - - - + + ${taskInfo.editorName } + ${taskInfo.auditorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index e256c9d34..aebed9bba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -81,16 +81,6 @@
    - + + + + + + +
    + + + + +

    + +

    + +
    +
    +
    +
    +
    + ${not empty specificServiceCfg.specServiceId?'修改':'添加'}
    +
    + +
    +
    + +
    + + +
    + + + + + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +     + +
    + +
    + +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp new file mode 100644 index 000000000..1681974f4 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp @@ -0,0 +1,97 @@ +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + + + +
    + + + + +

    + +

    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    + + +
    + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +     + +
    + +
    + +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp new file mode 100644 index 000000000..723f64b3f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -0,0 +1,262 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + + + + +
    + + +

    + 特定服务信息 + +

    + +
    +
    +
    +
    + +
    + +
    + + + + + + + + +
    +
    +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    + + + + + + +
    +
    + + + + + + +
    +
    + +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    +
    +
    + +
    +
    + +
    + + +
    + +
    +
    + + + +     + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号协议ID协议名称协议描述maat端配置分组id操作时间
    ${specificServiceCfg.showSequence}${specificServiceCfg.specServiceId}${specificServiceCfg.specServiceName}${fns:abbr(specificServiceCfg.specServiceDesc,15)}${specificServiceCfg.groupId }${fns:getDictLabel("SYS_YES_NO",specificServiceCfg.isLeaf,"0")} +
    + +
      +
      • + +
      • +       + +
      • +       + +
    +
    +
    +
    ${page}
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp new file mode 100644 index 000000000..03596f9ca --- /dev/null +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp @@ -0,0 +1,383 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + + + + +
    + + + + +

    + +

    + +
    +
    +
    +
    +
    + + ${not empty specificServiceHostCfg.hostId?'修改':'添加'} + + + +
    +
    +
    + +
    + +
    + + + + + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + + + ${dict.itemValue} + + +
    +
    +
    +
    + +
    +
    +
    + +
    + + -请选择协议类型- + + ${dict.itemValue} + + +
    +
    +
    +
    +
    + +
    + + + ${fns:getDictLabel("SPEC_AUDIT","0","0")} + + +
    +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + + <%--
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    --%> + + + + + +
    +
    +
    + + +
    +
    +
    +     + +
    +
    +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp new file mode 100644 index 000000000..f75ba66cb --- /dev/null +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp @@ -0,0 +1,356 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +特定服务服务器IP管理 + + + + + + + + + + + + + + + + + + + + + +
    + + +

    + 特定服务服务器IP管理 + +

    + +
    +
    +
    +
    + +
    + +
    + + + + + + + + +
    +
    + + + + ${dict.itemValue} + + +
    +
    + 协议ID + + + ${specServiceId} + + +
    +
    + 源Ip地址 + + + ${srcIp} + + +
    +
    + 目的Ip地址 + + + ${dstIp} + + +
    +
    + + -请选择方向- + + ${dict.itemValue} + + +
    +
    + + -请选择协议- + + ${dict.itemValue} + + +
    +
    + +
    +
    + +
    + + + +
    + + +
    + +
      +
      • +
      • +
      • +
    +
    + + + +
    + + +
    + + + + + + +
    +
    + +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    + +
    + +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    +
    + +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> +
    +
    +
    + +
    +
    + +
    + + +
    + +
    +
    + + + +     + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    协议id源IP地址源地址掩码源端口源端口掩码目的IP地址目的地址掩码目的端口目的端口掩码方向协议是否审核创建人员配置时间修改人员修改时间审核人员审核时间
    ${specificServiceHostCfg.specServiceId }${specificServiceHostCfg.srcIp }${specificServiceHostCfg.srcIpMask }${specificServiceHostCfg.srcPort }${specificServiceHostCfg.srcPortMask }${specificServiceHostCfg.dstIp }${specificServiceHostCfg.dstIpMask }${specificServiceHostCfg.dstPort }${specificServiceHostCfg.dstPortMask }${fns:getDictLabel("SPEC_DIRECTION",specificServiceHostCfg.direction,"0")}${fns:getDictLabel("SPEC_PROTOCOL",specificServiceHostCfg.protocol,"0")}${fns:getDictLabel("SPEC_AUDIT",specificServiceHostCfg.isAudit,"0")}${fns:getUserById(specificServiceHostCfg.creator.id).name}${fns:getUserById(specificServiceHostCfg.editor.id).name}${fns:getUserById(specificServiceHostCfg.auditor.id==null?0:specificServiceHostCfg.auditor.id).name}
    +
    ${page}
    +
    +
    +
    +
    +
    + + From 9419c48077d91dbcc13ea6ebe2b10968ea321ba0 Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Sat, 17 Mar 2018 17:14:59 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=B9=E5=AE=9A?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=E3=80=81=20=E7=89=B9?= =?UTF-8?q?=E5=AE=9A=E6=9C=8D=E5=8A=A1=E6=9C=8D=E5=8A=A1=E5=99=A8IP?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=EF=BC=88=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B0=9A=E6=9C=AA=E5=85=A8=E9=83=A8=E5=AE=8C=E5=96=84?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/specific/specificServiceHostCfgList.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp index f75ba66cb..1ca945007 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp @@ -197,9 +197,9 @@
      -
      • -
      • -
      • +
      • +
      • +
    Date: Sun, 18 Mar 2018 14:57:48 +0800 Subject: [PATCH 13/29] =?UTF-8?q?1=E3=80=81=E5=B7=B2=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E5=BD=93=E5=89=8D=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=8F=9C=E5=8D=95=E6=97=A0=E9=80=89=E4=B8=AD=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=9B=202=E3=80=81=E5=B7=B2=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=97=A0=E6=95=88=EF=BC=9B=203=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=B7=A6=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E8=8F=9C=E5=8D=95=E5=AF=BC=E8=88=AA=E6=9C=AA=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=A0=87=E8=AE=B0=E5=BD=93=E5=89=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=EF=BC=9B=204=E3=80=81=E5=B7=B2=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E4=B8=BB=E7=95=8C=E9=9D=A2=E7=9A=84=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8C=BA=E5=9F=9F=EF=BC=8C=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E7=82=B9=E5=BC=80=E2=80=9C=E7=AD=9B=E9=80=89=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E6=89=BE=E5=88=B0=E6=90=9C=E7=B4=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 2 +- .../resources/messages/message_ru.properties | 2 +- .../messages/message_zh_CN.properties | 2 +- src/main/webapp/WEB-INF/include/header.jsp | 4 + src/main/webapp/WEB-INF/include/left_menu.jsp | 22 +- src/main/webapp/WEB-INF/views/home.jsp | 105 +++++++- .../plugins/bootstrap-typeahead/README.md | 254 ++++++++++++++++++ .../bootstrap3-typeahead.min.js | 1 + .../static/global/plugins/typeahead/LICENSE | 19 -- .../static/global/plugins/typeahead/README.md | 188 ------------- .../plugins/typeahead/handlebars.min.js | 29 -- .../plugins/typeahead/typeahead.bundle.min.js | 8 - .../global/plugins/typeahead/typeahead.css | 68 ----- .../webapp/static/global/plugins/unicodes.js | 187 +++++++++++++ .../webapp/static/global/scripts/jeesite.js | 4 +- .../static/layouts/layout/css/layout.css | 7 +- .../layouts/layout/css/themes/default.css | 30 ++- .../static/layouts/layout/scripts/layout.js | 4 +- src/main/webapp/static/pages/scripts/home.js | 25 ++ 19 files changed, 607 insertions(+), 354 deletions(-) create mode 100644 src/main/webapp/static/global/plugins/bootstrap-typeahead/README.md create mode 100644 src/main/webapp/static/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js delete mode 100644 src/main/webapp/static/global/plugins/typeahead/LICENSE delete mode 100644 src/main/webapp/static/global/plugins/typeahead/README.md delete mode 100644 src/main/webapp/static/global/plugins/typeahead/handlebars.min.js delete mode 100644 src/main/webapp/static/global/plugins/typeahead/typeahead.bundle.min.js delete mode 100644 src/main/webapp/static/global/plugins/typeahead/typeahead.css create mode 100644 src/main/webapp/static/global/plugins/unicodes.js diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 151a00e5e..17e69595a 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -11,7 +11,7 @@ officeManage=office management userManage=user management notify=my notify help=help -home=home +home=Home panel=my panel userInfo=personal information updatePwd=update password diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index bfc2ce39a..0b41dd96d 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -11,7 +11,7 @@ officeManage=office management userManage=user management notify=my notify help=help -home=home +home=Home panel=my panel userInfo=personal information updatePwd=update password diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index aff485af6..66f7a90c0 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -11,7 +11,7 @@ officeManage=\u673a\u6784\u7ba1\u7406 userManage=\u7528\u6237\u7ba1\u7406 notify=\u6211\u7684\u540c\u5fd7 help=\u5173\u4e8e\u5e2e\u52a9 -home=\u5b98\u65b9\u9996\u9875 +home=\u9996\u9875 panel=\u6211\u7684\u9762\u677f userInfo=\u4e2a\u4eba\u4fe1\u606f updatePwd=\u4fee\u6539\u5bc6\u7801 diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index 44ba82c87..2f5be988c 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -47,6 +47,10 @@ + + + + diff --git a/src/main/webapp/WEB-INF/include/left_menu.jsp b/src/main/webapp/WEB-INF/include/left_menu.jsp index 071075475..682412d8e 100644 --- a/src/main/webapp/WEB-INF/include/left_menu.jsp +++ b/src/main/webapp/WEB-INF/include/left_menu.jsp @@ -7,16 +7,17 @@
      + data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200" + menu-id="${menu.id }" menu-name="" > -
    • active open"> +
    • active open"> +