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

解决版本冲突 更新代码

Browse Source
This commit is contained in:
zhangshilin
2018-03-13 13:01:00 +08:00
parent f02d7aca20
commit c2f959fd3c
4 changed files with 143 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,67 +28,67 @@ text_monitor=text monitor
text_enhance_manage=text enhance manage text_enhance_manage=text enhance manage
text_enhance_monitor=text enhance monitor text_enhance_monitor=text enhance monitor
plaintext_manage=plaintext manage plaintext_manage=plaintext manage
monitor_white=monitor white control_white=control white
ip_monitor_white=ip monitor white ip_control_white=ip control white
monitor_grey=monitor grey control_grey=control grey
social_app_grey=social app grey social_app_grey=social app grey
encryption_monitor=encryption monitor encryption_control=encryption control
specific_agreement_monitor=specific agreement monitor specific_agreement_control=specific agreement control
social_app_monitor=social app monitor social_app_control=social app control
online_media_monitor=online media monitor online_media_control=online media control
sip_ip_monitor=sip ip monitor sip_ip_control=sip ip control
domain_monitor_white=domain monitor white domain_control_white=domain control white
ip_address_monitor=ip address monitor ip_address_control=ip address control
ip_monitor=ip monitor ip_control=ip control
ip_port_monitor=ip port monitor ip_port_control=ip port control
domain_monitor=domain monitor domain_control=domain control
dns_monitor=dns monitor dns_control=dns control
basic_configuration=basic configuration basic_configuration=basic configuration
letter_from=letter from letter_from=letter from
classification=classification classification=classification
classification_manage=classification_manage classification_manage=classification manage
attribute_manage=attribute_manage attribute_manage=attribute manage
area_manage=area_manage area_manage=area manage
isp_manage=isp_manage isp_manage=isp manage
feature_scope_manage=feature_scope_manage feature_scope_manage=feature scope manage
special_tasks=special tasks special_tasks=special tasks
label_manage=label manage label_manage=label manage
protect_list=protect list protect_list=protect list
effect_range=effect range effect_range=effect range
agreement_ip_configuration=agreement ip configuration agreement_ip_configuration=agreement ip configuration
ip_spoofing_configuration=ip spoofing configuration ip_spoofing_configuration=ip spoofing configuration
website_monitor=website monitor website_control=website control
host_monitor=host monitor host_control=host control
url_monitor=url monitor url_control=url control
website_keyword_monitor=website keyword monitor website_keyword_control=website keyword control
mail_monitor=mail monitor mail_control=mail control
recipient_monitor=recipient monitor recipient_control=recipient control
sender_monitor=sender monitor sender_control=sender control
theme_monitor=theme monitor theme_control=theme control
mail_keyword_monitor=mail keyword monitor mail_keyword_control=mail keyword control
mail_attachment_name_monitor=mail attachment name monitor mail_attachment_name_control=mail attachment name control
mail_attachment_content_monitor=mail attachment content monitor mail_attachment_content_control=mail attachment content control
file_transfer_monitor=file transfer monitor file_transfer_control=file transfer control
ftp_address_monitor=ftp address monitor ftp_address_control=ftp address control
ftp_name_monitor=ftp name monitor ftp_name_control=ftp name control
ftp_content_monitor=ftp content monitor ftp_content_control=ftp content control
http_app_feature=http app feature http_app_feature=http app feature
ssl_app_feature=ssl app feature ssl_app_feature=ssl app feature
tunnel_protocol_monitor=tunnel protocol monitor tunnel_protocol_control=tunnel protocol control
l2tp_ip_monitor=l2tp ip monitor l2tp_ip_control=l2tp ip control
pptp_ip_monitor=pptp ip monitor pptp_ip_control=pptp ip control
openvpn_monitor=openvpn monitor openvpn_control=openvpn control
ssh_monitor=ssh monitor ssh_control=ssh control
ssl_monitor=ssl monitor ssl_control=ssl control
ssl_feature_monitor=ssl feature monitor ssl_feature_control=ssl feature control
ssl_sni_monitor=ssl sni monitor ssl_sni_control=ssl sni control
ssl_address_monitor=ssl address monitor ssl_address_control=ssl address control
https_website_content_replace=https website content replace https_website_content_replace=https website content replace
https_website_monitor=https website monitor https_website_control=https website control
rtp_ip_monitor=rtp ip monitor rtp_ip_control=rtp ip control
mms_ip_monitor=mms ip monitor mms_ip_control=mms ip control
rtsp_ip_monitor=rtsp ip monitor rtsp_ip_control=rtsp ip control
rtmp_ip_monitor=rtmp ip monitor rtmp_ip_control=rtmp ip control
examine_manage=examine manage examine_manage=examine manage
audit_manage=audit manage audit_manage=audit manage
log_search=log search log_search=log search
@@ -137,6 +137,10 @@ begin_date=begin date
end_date=end date end_date=end date
delete=delete delete=delete
special_task=special task special_task=special task
cancel_approved=cancel approved
task_name=task name
task_org=task organization
task_time=task time
#============laihan end====================== #============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! login_timeout=No login or login timeout,please login again,Thank you!
captcha_error=captcha error captcha_error=captcha error
enter_captcha=Please enter the captcha 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===================== #==========message end=====================
#==========yewuliexingguanli begin===================== #==========yewuliexingguanli begin=====================

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

@@ -28,62 +28,67 @@ text_monitor=text monitor
text_enhance_manage=text enhance manage text_enhance_manage=text enhance manage
text_enhance_monitor=text enhance monitor text_enhance_monitor=text enhance monitor
plaintext_manage=plaintext manage plaintext_manage=plaintext manage
monitor_white=monitor white control_white=control white
ip_monitor_white=ip monitor white ip_control_white=ip control white
monitor_grey=monitor grey control_grey=control grey
social_app_grey=social app grey social_app_grey=social app grey
encryption_monitor=encryption monitor encryption_control=encryption control
specific_agreement_monitor=specific agreement monitor specific_agreement_control=specific agreement control
social_app_monitor=social app monitor social_app_control=social app control
online_media_monitor=online media monitor online_media_control=online media control
sip_ip_monitor=sip ip monitor sip_ip_control=sip ip control
domain_monitor_white=domain monitor white domain_control_white=domain control white
ip_address_monitor=ip address monitor ip_address_control=ip address control
ip_monitor=ip monitor ip_control=ip control
ip_port_monitor=ip port monitor ip_port_control=ip port control
domain_monitor=domain monitor domain_control=domain control
dns_monitor=dns monitor dns_control=dns control
basic_configuration=basic configuration basic_configuration=basic configuration
letter_from=letter from letter_from=letter from
classification=classification 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 special_tasks=special tasks
label_manage=label manage label_manage=label manage
protect_list=protect list protect_list=protect list
effect_range=effect range effect_range=effect range
agreement_ip_configuration=agreement ip configuration agreement_ip_configuration=agreement ip configuration
ip_spoofing_configuration=ip spoofing configuration ip_spoofing_configuration=ip spoofing configuration
website_monitor=website monitor website_control=website control
host_monitor=host monitor host_control=host control
url_monitor=url monitor url_control=url control
website_keyword_monitor=website keyword monitor website_keyword_control=website keyword control
mail_monitor=mail monitor mail_control=mail control
recipient_monitor=recipient monitor recipient_control=recipient control
sender_monitor=sender monitor sender_control=sender control
theme_monitor=theme monitor theme_control=theme control
mail_keyword_monitor=mail keyword monitor mail_keyword_control=mail keyword control
mail_attachment_name_monitor=mail attachment name monitor mail_attachment_name_control=mail attachment name control
mail_attachment_content_monitor=mail attachment content monitor mail_attachment_content_control=mail attachment content control
file_transfer_monitor=file transfer monitor file_transfer_control=file transfer control
ftp_address_monitor=ftp address monitor ftp_address_control=ftp address control
ftp_name_monitor=ftp name monitor ftp_name_control=ftp name control
ftp_content_monitor=ftp content monitor ftp_content_control=ftp content control
http_app_feature=http app feature http_app_feature=http app feature
ssl_app_feature=ssl app feature ssl_app_feature=ssl app feature
tunnel_protocol_monitor=tunnel protocol monitor tunnel_protocol_control=tunnel protocol control
l2tp_ip_monitor=l2tp ip monitor l2tp_ip_control=l2tp ip control
pptp_ip_monitor=pptp ip monitor pptp_ip_control=pptp ip control
openvpn_monitor=openvpn monitor openvpn_control=openvpn control
ssh_monitor=ssh monitor ssh_control=ssh control
ssl_monitor=ssl monitor ssl_control=ssl control
ssl_feature_monitor=ssl feature monitor ssl_feature_control=ssl feature control
ssl_sni_monitor=ssl sni monitor ssl_sni_control=ssl sni control
ssl_address_monitor=ssl address monitor ssl_address_control=ssl address control
https_website_content_replace=https website content replace https_website_content_replace=https website content replace
https_website_monitor=https website monitor https_website_control=https website control
rtp_ip_monitor=rtp ip monitor rtp_ip_control=rtp ip control
mms_ip_monitor=mms ip monitor mms_ip_control=mms ip control
rtsp_ip_monitor=rtsp ip monitor rtsp_ip_control=rtsp ip control
rtmp_ip_monitor=rtmp ip monitor rtmp_ip_control=rtmp ip control
examine_manage=examine manage examine_manage=examine manage
audit_manage=audit manage audit_manage=audit manage
log_search=log search log_search=log search
@@ -132,11 +137,15 @@ begin_date=begin date
end_date=end date end_date=end date
delete=delete delete=delete
special_task=special task special_task=special task
cancel_approved=cancel approved
task_name=task name
task_org=task organization
task_time=task time
#============laihan end====================== #============laihan end======================
#==========message begin===================== #==========message begin=====================
required=This field is required！ required=This field is required\uff01
select=Please select select=Please select
date_list=Date List date_list=Date List
confirm_message=Are you sure? 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! login_timeout=No login or login timeout,please login again,Thank you!
captcha_error=captcha error captcha_error=captcha error
enter_captcha=Please enter the captcha 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===================== #==========message end=====================
#==========yewuliexingguanli begin===================== #==========yewuliexingguanli begin=====================

9
src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
View File

@@ -11,6 +11,7 @@
function reset(){ function reset(){
$("#searchForm").reset(); $("#searchForm").reset();
} }
/** /**
处理全选、全取消 处理全选、全取消
**/ **/
@@ -69,6 +70,12 @@
} }
$(document).ready(function() { $(document).ready(function() {
//reset
$("#resetBtn").on("click",function(){
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
});
//设定显示总条数 //设定显示总条数
$("#showTotalCount").text('${showTotalCount}'); $("#showTotalCount").text('${showTotalCount}');
//设定selected，设定name 设定value //设定selected，设定name 设定value
@@ -230,7 +237,7 @@
<div class="pull-left"> <div class="pull-left">
<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索 </button> <button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索 </button>
<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置 </button> <button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置 </button>
</div> </div>
</div> </div>

7
src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
View File

@@ -77,6 +77,11 @@
$("#intype").attr("name",$("#seltype").find("option:selected").val()); $("#intype").attr("name",$("#seltype").find("option:selected").val());
$("#intype").val('${searchContent}'); $("#intype").val('${searchContent}');
//reset
$("#resetBtn").on("click",function(){
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
});
//筛选功能初始化 //筛选功能初始化
filterActionInit(); filterActionInit();
@@ -228,7 +233,7 @@
<div class="pull-left"> <div class="pull-left">
<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索 </button> <button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索 </button>
<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置 </button> <button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置 </button>
</div> </div>
</div> </div>