From d1ef4cfc1544bf15193f0ec8ca34505821d06cd2 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 10 Jul 2018 16:50:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=B7=E4=BE=8B=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=B8=8A=E4=BC=A0=E6=A0=B7=E4=BE=8B=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=B8=8B=E5=8F=91MD5=E5=87=BA=E9=94=99?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index a0dbe6c4f..26c61af20 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -403,6 +403,12 @@ sample_path = #{samplePath,jdbcType=VARCHAR}, + + src_md5 = #{srcMd5,jdbcType=VARCHAR}, + + + sample_md5 = #{sampleMd5,jdbcType=VARCHAR}, + where cfg_id = #{cfgId,jdbcType=BIGINT} From 0504326fb6c2043dfc76d841c32cdb46a37df0c0 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Tue, 10 Jul 2018 17:03:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- .../resources/messages/message_en.properties | 1475 +++++++++-------- 1 file changed, 788 insertions(+), 687 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4a85ebdff..f78624e89 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1,746 +1,847 @@ #menu and button info -funMenu=function menu -sysManage=system management -sysAuthor=system authorization -menuManage=menu management -roleManage=role management -dictManage=dictionary management -basicManage=basic management -areaManage=area management -officeManage=office management -userManage=user management -notify=my notify -help=help +funMenu=Function Menu +sysManage=System Management +sysAuthor=System Authorization +menuManage=Menu Management +roleManage=Role Management +dictManage=Dictionary Management +basicManage=Basic Management +areaManage=Area Management +officeManage=Office Management +userManage=User Management +notify=My Notice +help=Help home=Home -panel=my panel -userInfo=personal information -updatePwd=update password -show=show -edit=edit -hi=hi -exit=exit -choose=choose -onloading=onloading... -#============menu begin====================== -requestInfo=requestInfo -configuration_manage=configuration manage -text_control=text control -text_monitor=text monitor -text_enhance_manage=text enhance manage -text_enhance_monitor=text enhance monitor -plaintext_manage=plaintext manage -control_white=control white -ip_control_white=ip control white -control_grey=control grey -social_app_grey=social app grey -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 -domain_control=domain control -dns_control=dns control -basic_configuration=basic configuration -letter_from=letter from -classification_manage=classification manage -area_manage=area 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_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 -subject_control=subject control -mail_keyword_control=mail keyword content 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_control=tunnel protocol control -l2tp_ip_control=l2tp ip control -pptp_ip_control=pptp ip control -openvpn_control=openvpn control -socks_control= socks control -gre_control=gre control -ike_control=ike control -ipsec_control=ipsec 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_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 -sysService_manage=system service manage -service_manage=service type manage -system_service_manage=system service type manage -features_area=features area -attribute_manage=attribute manage -isp_manage=isp 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 -mail_attachment_content_monitor=mail attachment content monitor -specific_service_cfg=specific service cfg -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 -original_remain_monitor=original packet remain monitor -ip_multi_domain_monitor=IP multi domain monitor -website_multi_domain_monitor=website multi domain monitor -request_header_monitor=request header domain monitor -response_header_monitor=response header domian monitor -ip_website_keyword_monitor=IP+website keyword monitor -request_header_keyword_monitor=request header domain keyword monitor -response_header_keyword_monitor=response header domain keyword monitor -mail_multi_monitor=mail multi domain monitor -mail_key_monitor=mail keyword monitor -file_transfer_multi_monitor=file transfer multi domain monitor -ftp_multi_monitor=FTP multi domain monitor -ssl_multi_monitor=SSL multi domain monitor -dns_request_monitor=DNS request monitor -dns_server_monitor=DNS server monitor -request_header_keyword_control=request header domain keyword control -response_header_keyword_control=response header domain keyword control -mail_key_control=mail keyword control -ftp_multi_control=FTP multi domain control -ftp_control=FTP control -tunnel_protocol_multi_control=tunnel protocol multi domain control -l2tp_protocol_control=L2TP protocol control -pptp_protocol_control=PPTP protocol control -ssl_multi_control=SSL multi domain control -ssl_certificate_control=SSL certificate control -ssl_certificate_monitor=SSL certificate monitor -response_header_control=response header control -ip_website_text_control=ip website text control -request_task=request and task -#============menu end====================== +panel=My Panel +userInfo=User Infomation +updatePwd=Modify Password +show=Show +edit=Edit +hi=Hi +exit=Logout +choose=Choose +onloading=Loading... +#==========menu begin===================== +requestInfo=Request Infomation +configuration_manage=Configuration Management +text_control=Text Routine Control +text_monitor=Text Routine Monit +text_enhance_manage=Text Enhance Control +text_enhance_monitor=Text Enhance Monit +plaintext_manage=Plaintext Control +control_white=White List +ip_control_white=Ip White List +control_grey=Grey List +social_app_grey=Social Application Grey List +encryption_control=Encrypted Text Control +specific_agreement_control=Specific Protocol Control +social_app_control=Social Application Control +online_media_control=Online Media Control +sip_ip_control=SIP IP Control +domain_control_white=Domainl White List +ip_address_control=IP Control +ip_control=IP Control +domain_control=Domain Control +dns_control=DNS Control +basic_configuration=Basic Configuration +Request_from=Request Office +classification_manage=Classification Management +area_manage=Area Management +feature_scope_manage=Feature Scope Management +special_tasks=Special Task +label_manage=Label Management +protect_list=Protect List +effect_range=Effective Range +agreement_ip_configuration=Protocol IP Management +ip_spoofing_configuration=Spoofing IP Management +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 +subject_control=Subject 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 Url Control +ftp_name_control=FTP Filename Control +ftp_content_control=FTP File Content Control +http_app_feature=Social Application HTTP Feature +ssl_app_feature=Social Application SSL Feature +tunnel_protocol_control=Tuunel Protocol IP Control +l2tp_ip_control=L2TP IP Control +pptp_ip_control=pptp IP Control +openvpn_control=OpenVPN Control +socks_control=Socks Control +gre_control=GRE Control +ike_control=IKE Control +ipsec_control=IPSec Control +ssh_control=SSH Control +ssl_control=SSL Control +ssl_feature_control=SSL Cert Control +ssl_sni_control=SSL SNI Control +ssl_address_control=SSL IP Control +https_website_content_replace=HTTPS Content Replace +https_website_control=HTTPS Website Replace +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 Management +audit_manage=Audit Management +log_search=Log Search +sysService_manage=System Business Management +service_manage=Service Type Management +system_service_manage=System Service Management +features_area=Feature Area +attribute_manage=Attribute Management +isp_manage=ISP Management +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=Http Request Header Control +plaintext_monitor=Plaintext Monit +ip_address_monitor=IP Monit +ip_port_monitor=IP+Port Monit +domain_monitor=Domain Monit +dns_monitor=DNS Monit +dns_response_monitor=DNS Response Monit +website_monite=Website Monit +host_monitor=HOST Monit +url_monitor=URL Monit +website_keyword_monitor=Website Content Monit +mail_monitor=Mail Monit +recipient_monitor=Recipient Monit +sender_monitor=Sender Monit +subject_monitor=Subject Monit +mail_keyword_monitor=Mail Content Monit +mail_attachment_name_monitor=Mail Attachment Name Monit +mail_attachment_content_monitor=Mail Attachment Content Monit +specific_service_cfg=Specific Service Management +file_transfer_monitor=File Transfer Monit +ftp_address_monitor=FTP URL Monit +encryption_monitor=Encypted Content Monit +tunnel_protocol_monitor=Tunnel Protocol Monit +pptp_ip_monitor=PPTP Monit +l2tp_ip_monitor=L2TP Monit +ssh_monitor=SSH Monit +ssl_monitor=SSL Monit +ssl_feature_monitor=SSL Cert Monit +ssl_sni_monitor=SSL SNI Monit +ssl_address_monitor=SSL IP Monit +specific_service_host_cfg=Specific Service Host Management +original_remain_monitor=Origianl Package Monit +ip_multi_domain_monitor=IP Multiple Monit +website_multi_domain_monitor=Website Multiple Monit +request_header_monitor=Http Request Header Monit +response_header_monitor=Http Response Header Monit +ip_website_keyword_monitor=IP+Website Keyword Monit +request_header_keyword_monitor=Request Header Keyword Monit +response_header_keyword_monitor=Response Header Keyword Monit +mail_multi_monitor=Mail Multiple Monit +mail_key_monitor=Mail Keyword Monit +file_transfer_multi_monitor=File Transfer Multiple Monit +ftp_multi_monitor=FTP Multiple Monit +ssl_multi_monitor=SSL Multiple Monit +dns_request_monitor=DNS Request Monit +dns_server_monitor=DNS Host Monit +request_header_keyword_control=Request Header Keyword Control +response_header_keyword_control=Response Header Keyword Control +mail_key_control=Mail Keyowrd Control +ftp_multi_control=FTP Multiple Control +ftp_control=FTP Control +tunnel_protocol_multi_control=Tunnel Multiple Control +l2tp_protocol_control=L2TP Control +pptp_protocol_control=PPTP Control +ssl_multi_control=SSL Multiple Control +ssl_certificate_control=SSL Cert Control +ssl_certificate_monitor=SSL Cert Monit +response_header_control=Response Header Control +ip_website_text_control=IP+Website Keyowrd Control +request_task=Request And Task +#==========menu end===================== -#============yewu begin====================== -service_dict_id=servicedictid -item_type=itemtype -item_code=itemcode -item_value=itemvalue -desc=description -parent_id=parentid -is_leaf=whether leaf node -is_valid=whether valid -create_time=create time -superior_config=superior configuration -config_content=configuration content -root_node=root node -leafChange=this configuration includes subnode,cannot be leaf node -typeChild=this data type will be not same with subnode -typeSame=please select the consistent upper and lower data types -isLevelNoSure=more than the maximum level -submitting=submitting -#============yewu end====================== - -#============laihan begin====================== -refresh=refresh -add=add -request_number=request number -state=state -created=created -examine=examine -unapproved=unapproved -approved=approved -title=title -request_time=request time -operate_time=operate time -search=search -request_organization=request organization -operator=operator -content=content -remarks=remarks -operation=operation -submit=submit -cancel=cancel -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====================== +#==========yewu zidian begin===================== +service_dict_id=Dictionary ID +item_type=Data Type +item_code=Item Code +item_value=Item Value +desc=Description +parent_id=Parent ID +is_leaf=Is Leaf Node +is_valid=Is Valid +create_time=Create Time +superior_config=Parent Node +config_content=Configuration Content +root_node=Root Node +leafChange=This node contains a subnode,Can't be changed to a leaf node. +typeChild=This node contains a subnode,Disagreement with Subclasses after the change of data types. +typeSame=Please select the consistent upper and lower configuration data types. +isLevelNoSure=The number of upper and lower levels of this configuration will exceed the maximum level. +submitting=Being submitted +#==========yewu zidian end===================== +#==========laihan begin===================== +refresh=Refresh +add=Add +request_number=Request Number +state=State +created=Unaudited +examine=Examine +unapproved=Unapproved +approved=Approved +title=Title +request_time=Request Time +operate_time=Operation Time +search=Search +request_organization=Request Organization +operator=Operator +content=Content +remarks=Remark +operation=Operation +submit=Submit +cancel=Cancel +begin_date=Begion Time +end_date=End Time +delete=Delete +special_task=Special Task +task_name=Task Name +task_org=Submitted Organization +task_time=Submitted Time +#==========laihan end===================== #==========message begin===================== -required=This field is required! -select=Please select +required=Can't be empty\! +select=Please Select date_list=Data List -confirm_message=Are you sure? -export_confirm_message=The maximum number of data exported from the data is -fill_loginName=Please fill in the loginName -fill_loginPassWord=Please fill in the passWord -loginName_error=loginName and password error,please try again. -system_error=system error,please try again later! -save_success=save success -save_failed=save failed -update_success=update success -update_failed=update failed -delete_success=delete success -delete_failed=delete failed -delete_failed_admin=delete failed,administrator user is not allowed to be deleted -audit_success=auditing success -audit_failed=auditing failed -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 +confirm_message=Confirm\uFF1F +export_confirm_message=The maximum number of data exported +fill_loginName=Please Enter Login Account +fill_loginPassWord=Please Enter Login Password +loginName_error=Account or password wrong ,Please try again. +system_error=There is a problem in the system. Please try again later\uFF01 +save_success=Save Success +save_failed=Save Failed +update_success=Edit Success +update_failed=Edit Failed +delete_success=Delete Success +delete_failed=Delete Failed +delete_failed_admin=Delete Failed, Admin account can't be deleted +audit_success=Examine Success +audit_failed=Examine Failed +turning_page=Redirect URL +login_timeout=No login or login timeout, please log in again. Thank you.\! +captcha_error=Validation code is incorrect +enter_captcha=Please enter the verification code +input=Please enter +input_title=Please enter title +all_states=All State +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 ! -one_more_area=Regional control,must full in the operator or IP information ! -custom_columns=custom columns -maxlength_64=The maxlength is 64! -maxlength_128=The maxlength is 128! -maxlength_256=The maxlength is 256! -maxlength_512=The maxlength is 512! -maxlength_4000=The maxlength is 4000! +reset=Reset +info=Prompt +has_approved=After audited, the operation can not be carried out\uFF01 +hasnot_approved=The operation cannot be carried out without approval\uFF01 +check_one=Please Select one data\uFF01 +one_more=Select at least one data\! +one_more_area=Please Select ISP\! +custom_columns=Custom column fields +maxlength_64=Please enter a string with a maximum of 64\uFF01 +maxlength_128=Please enter a string with a maximum of 128\uFF01 +maxlength_256=Please enter a string with a maximum of 256\uFF01 +maxlength_512=Please enter a string with a maximum of 512\uFF01 +maxlength_4000=Please enter a string with a maximum of 4000\uFF01 ok=ok clear=clear close=close -reselect=please re-select -no_root=Root node can not be selected -no_parent=Parent node can not be selected -no_public_model=The public model can not be selected -no_outside_column=You can not select the other column models except the current column -send_org=please select the sending organization -department=department -sendind_org=sending organization -no_node=Node can not be selected -select_icon=select icon -nothing=nothing -noneData=Could not find any record that met the condition. +reselect=Please Reselect +no_root=Root node cannot be selected +no_parent=Parent node cannot be selected +no_public_model=The public model cannot be selected +no_outside_column=Cannot choose the column model outside the current column +send_org=Please Select Send Office +department=Deparment +sendind_org=Send Office +no_node=This node cannot be selected +select_icon=Choose Icon +nothing=None +noneData=Not querying a qualified record #==========message end===================== #==========yewuliexingguanli begin===================== -all=all -act=action -block=block -monitor=monitor -block_white_list=block white list -monitor_white_list=monitor white list -block_monitor_white_list=block monitor white list -grey_list=grey list -type=type -domain_name=domain name -single_domain=single domain -multi_domain=multi domain -special_service=special service -service_name=service name -service_id=service ID -repeat=repeat -enter_error=enter error -single_service_message=single domain services can only associate one table -special_service_message=special services can only associate one table -table_name=table name -table_type=table type -string=string -number=number -strong_string=enhanced string -table_des=table_describe -detail=detail -datebase_table=datebase table -fill_all=fill in all -describe=describe -back=back -initial_data_is_not_allowed_to_edit=initial data is not allowed to edit -initial_data_is_not_allowed_to_delete=initial data is not allowed to delete +all=All +act=Action +block=Block +monitor=Monit +block_white_list=Block White List +monitor_white_list=Monit White List +block_monitor_white_list=Block Monit White List +grey_list=Grey List +type=Type +domain_name=Domain +single_domain=Single Region +multi_domain=Multiple Region +special_service=Specific Service +service_name=Service Name +service_id=Service ID +repeat=Repeat +enter_error=Enter error,Please correct +#single_service_message=\u5355\u57DF\u4E1A\u52A1\u53EA\u80FD\u5173\u8054\u4E00\u4E2A\u8868 +#special_service_message=Specific Service\u53EA\u80FD\u5173\u8054\u4E00\u4E2A\u8868 +#table_name=\u8868\u540D +#table_type=\u8868Type +#string=\u5B57\u7B26\u4E32 +#number=\u6570\u503C +#strong_string=\u589E\u5F3A\u5B57\u7B26\u4E32 +#table_des=\u8868\u63CF\u8FF0 +detail=Detail +#datebase_table=\u6570\u636E\u5E93\u8868 +#fill_all=\u8BF7\u586B\u5199\u6240\u6709\u5B57\u6BB5 +#describe=\u63CF\u8FF0 +back=return +#initial_data_is_not_allowed_to_edit=\u521D\u59CB\u6570\u636E\u4E0D\u5141\u8BB8\u4FEE\u6539 +#initial_data_is_not_allowed_to_delete=\u521D\u59CB\u6570\u636E\u4E0D\u5141\u8BB8\u5220\u9664 #==========yewuliexingguanli end===================== #==========youjianguankong begin===================== -sort=sort -createTime_asc=order by createTime asc -createTime_desc=order by createTime desc -editTime_asc=order by editTime asc -editTime_desc=order by editTime desc -auditTime_asc=order by auditTime asc -auditTime_desc=order by auditTime desc -config_describe=configuration description -match_area=matching area -key_word=key word -block_type=block type -letter=letter -whether_area_block=whether area block -classification=classification -label=label -attribute=attribute -area=area -isp=isp -scope=scope -valid_identifier=valid identifier -is_audit=whether audit -creator=creator -config_time=configuration time -editor=editor -edit_time=edit time -auditor=auditor -audit_time=audit time -yes=yes -no=no -deleted=deleted +sort=Sort +createTime_asc=Ascending order by create time +createTime_desc=Reversse order by create time +editTime_asc=Ascending order by edit time +editTime_desc=Reversse order by edit time +auditTime_asc=Ascending order by audit time +auditTime_desc=Reversse order by audit time +config_describe=Configuration Description +match_area=Match District +key_word=Keyowrd +block_type=ControlType +Request=Request +whether_area_block=Is area control +classification=Classification +label=Label +attribute=Attribute +area=Area +isp=ISP +scope=Feature Scope +valid_identifier=Valid Intentifier +is_audit=Is Approved +creator=Creator +config_time=Create Time +editor=Editor +edit_time=Edit Time +auditor=Audited\u4EBA\u5458 +audit_time=Audited Time +yes=Yes +no=No +deleted=Deleted +cancel_approved=Cancel Audited #==========youjianguankong end===================== #==========guankongbaimingdan begin===================== -client_ip=client ip -server_ip=server ip -client_port=client port -client_port_mask=client port mask -client_address_mask=client address mask -server_port=server port -server_port_mask=server port mask -server_address_mask=server address mask -block_addr=block address -block_domain=block domain -block_url=block url -configuration=configuration -direction=direction -protocol=protocol -oneway=oneway -twoway=both -arbitrary=arbitrary -basic_config=basic configuration -block_config=configuration info -expression_type=expression type -null=null -and=& -match_method=match method -substring_match=substring match -right_match=right match -left_match=left match -exactly_match=exactly match -whether_hexbinary=whether HEX binary -hex_binary=HEX binary -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 +client_ip=Client IP +server_ip=Server IP +client_port=Client Port +client_port_mask=Client Port Mask +client_address_mask=Client IP Mask +server_port=Server Port +server_port_mask=Server Port Mask +server_address_mask=Server IP Mask +block_addr=Ip Control +block_domain=Domain Control +block_url=Block Url +configuration=Configuration +direction=Direction +protocol=Protocol +#oneway=\u5355\u5411 +#twoway=\u53CC\u5411 +arbitrary=Arbitrarily +basic_config=Basic Configuration +block_config=Configuration Info +expression_type=Expression Type +null_expression=No expression +and_expression=& +match_method=Match Method +substring_match=Substring Match +right_match=Right Match +left_match=Left Match +exactly_match=Exactly Match +whether_hexbinary=\u662F\u5426hex\u4E8C\u8FDB\u5236 +hex_binary=HEX format +case_insensitive_nohex=Case insensitive,and not HEX +case_sensitive_nohex=Case sensitivity,and not HEX +area_effect_id=Area Effective +ip_type=IP Type #==========guankongbaimingdan end===================== #==========tedingfuwu begin===================== -protocol_id=protocol ID -protocol_name=protocol name -group_id=group ID -input_protocol_id=please enter protocol ID -input_integer=please enter right integer -protocol_desc=protocol description +protocol_id=Protocol ID +protocol_name=Protocol Name +group_id=Configuration Group ID +input_protocol_id=Please enter protocol ID +input_integer=Please enter correct Number +protocol_desc=Protocol Description +max_value=The maximum value should not be greater than +min_value=The minimum value should not be less than #==========tedingfuwu end===================== #==========xitongguanli begin====================== -owner_company=owner company -company=company -owner_group=owner group -group=group -template=template -export=export -import=import -sure_export=Do you confirm the export data -sure_delete=Do you confirm the delete data -login_name=login name -name=name -identify_mark=identify mark -mail=mail -role=role -manager=manager -ordinary_man=ordinary man -nextPage=next Page -previousPage=previous Page -total=total -current=current -page=page -count=count -name_image=name image -organizer=organizer -save_organization=save organization -success=success -password=password -nochange_blank=please fill blank if you have no change -confirm_password=confirm password -manager_info=the manager needs to specify the identity as the "manager",otherwise the audit process will be affected! -name_existed=name existed -company_range=The department does not belong to the company -equal_password=Please enter the same password as above -choose_org=choose organization -org_name=organization name -belong_area=belong area -org_coding=organization coding -level=level -org_type=organization type -org_duty_type=organization duty type -add_level=add level -delete_all_child=Do you want to delete this and all level -parent_org=parent organization -org_level=organization level -is_useable=whether useable -is_useable_info="Yes" indicates that the account is allowed to login and "No" is not. -leader=leader -vice_leader=vice leader -address=address -master=master -post_code=post code -phone=phone -fax=fax -nochange=no edit record -module_name=module name -dict_mark=dict mark -run_state=running state -mark=mark -value=value -is_maintain=whether maintain -last_edit_time=last edit time -dict_edit_record=dict edit record -dict_detail=dict detail -edit_record=edit record -edit_record_view=edit record view -dict_edit_info=dictionary is very import in the system,Do you decide to edit? -dict_delete_info=dictionary is very import in the system,Do you decide to delete? -dict_saveitem_error=save message error,enter a entry! -dict_saveitem_nullerror=Save info error,every entry and value can not be empty! -submit_error=configuration submit error,please look at the error info! -form_validate=form validate success -entry=entry -add_entry=add entry -click_add_entry=click add entry -maintainable=maintainable -useable=useable -click_add=click add -menu_name=menu name -unicode=unicode -link=link -visible=visible -permission_mark=permission mark -display=display -hide=hide -add_child_menu=add child menu -save=save -save_sort=save sort -menu=menu -parent_menu=parent menu -aim=aim -click_menu_turn=the page of click the menu -link_window_info=the aim window of the link,default:mainFrame -is_top_menu=whether the top menu -icon=icon -is_top_menu_info=Is the menu or operation the top navigation menu? -sort_info=order by asc -is_show_sysmenu=Is the menu or operation displayed in the system menu? -control_permission_info=Permission identity defined in the controller,for example:@RequiresPermissions("permission mark") -role_name=role name -data_range=data range -allot=allot -role_type=role type -role_permission=role permission -task_allot=task allot -role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4\u7C7B\u578B\:security-role,assignment,user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1 -role_type_info=workflow group user type(task allocation:assignment,management role:security-role,ordinary role:user) -data_range_info=in special cases -permission_list=permission list -area_name=area name -area_code=area code -area_type=area type -longitude=longitude -latitude=latitude -role_list=role list -role_allot=role allot -staff_list=staff list -choose_and_allot=By selecting department,we assign roles to the listed people. -loading=loading... -remove=remove -sure_remove_role= role will be removed from this user? -system_prompt=system prompt -old_password=old password -new_password=new password -sure_new_password=confirm new password -be_selected_staff=be selected staff -selected_staff=selected staff -old_remove_error=old role can be removed! -selected_clear_success=selected staff clear success! -cancel_clear=cancel clear! -sure_clear=clear -role_no_new=role dont have new staff! -role_unique=role name is exist -role_error_info=input error -user=users -organization=organization -file_management=file management -insert=insert +owner_company=\u5F52\u5C5E\u516C\u53F8 +company=\u516C\u53F8 +owner_group=\u5F52\u5C5E\u90E8\u95E8 +group=\u90E8\u95E8 +template=Template Download +export=Export +import=Import +sure_export=\u786E\u8BA4\u8981\u5BFC\u51FA\u7528\u6237\u6570\u636E\u5417 +sure_delete=Confirm delete user? +login_name=login ID +name=Name +identify_mark=\u8EAB\u4EFD\u6807\u8BC6 +mail=\u90AE\u7BB1 +role=Role +manager=Management\u4EBA\u5458 +ordinary_man=\u666E\u901A\u4EBA\u5458 +nextPage=Next Page +previousPage=Previous Page +total=Total +current=Current +page=Pages +count=Rows +name_image=Image +organizer=\u5F52\u5C5E\u5355\u4F4D +save_organization=\u4FDD\u5B58\u673A\u6784 +success=Success +password=Password +nochange_blank=If don't modify,please keep blank +confirm_password=Confirm Password +manager_info=Management\u4EBA\u5458\u9700\u6307\u5B9A\u8EAB\u4EFD\u6807\u8BC6\u4E3A\u201C Management\u4EBA\u5458\u201D,\u5426\u5219\u5F71\u54CDAudited\u6D41\u7A0B\uFF01 +name_existed=Login id has existed +company_range=\u90E8\u95E8\u4E0D\u518D\u516C\u53F8\u8303\u56F4\u5185 +equal_password=\u8F93\u5165\u4E0E\u4E0A\u9762\u76F8\u540C\u7684\u5BC6\u7801 +choose_org=\u9700\u9009\u62E9\u6240\u5728\u5355\u4F4D +org_name=\u673A\u6784Name +belong_area=\u5F52\u5C5E\u533A\u57DF +org_coding=\u673A\u6784\u7F16\u7801 +level=\u6240\u5C5E\u7EA7\u522B +org_type=\u673A\u6784Type +org_duty_type=\u673A\u6784\u804C\u8D23\u5206\u7C7B +add_level=\u6DFB\u52A0\u4E0B\u7EA7\u673A\u6784 +delete_all_child=\u8981\u5220\u9664\u8BE5\u9879\u53CA\u6240\u6709\u5B50\u9879\u5417 +parent_org=\u4E0A\u7EA7\u673A\u6784 +org_level=\u673A\u6784\u7EA7\u522B +is_useable=\u662F\u5426\u53EF\u7528 +is_useable_info=\u201C\u662F\u201D\u4EE3\u8868\u6B64 Account\u5141\u8BB8\u767B\u9646,\u201C\u5426\u201D\u5219\u8868\u793A\u6B64 Account\u4E0D\u5141\u8BB8\u767B\u9646 +leader=\u4E3B\u8D1F\u8D23\u4EBA +vice_leader=\u526F\u8D1F\u8D23\u4EBA +address=\u8054\u7CFB\u5730\u5740 +master=\u8D1F\u8D23\u4EBA +post_code=\u90AE\u653F\u7F16\u7801 +phone=\u7535\u8BDD +fax=\u4F20\u771F +nochange=\u6682\u65E0\u4FEE\u6539\u8BB0\u5F55\! +module_name=\u6A21\u5757Name +dict_mark=\u5B57\u5178\u6807\u8BC6 +run_state=\u8FD0\u884CState +mark=\u6807\u8BC6 +value=\u503C +is_maintain=\u662F\u5426\u53EF\u7EF4\u62A4 +last_edit_time=\u6700\u540E\u4FEE\u6539\u65F6\u95F4 +dict_edit_record=\u5B57\u5178\u4FEE\u6539\u8BB0\u5F55 +dict_detail=\u5B57\u5178\u8BE6\u60C5 +edit_record=\u4FEE\u6539\u8BB0\u5F55 +edit_record_view=\u4FEE\u6539\u8BB0\u5F55\u67E5\u770B +dict_edit_info=\u6570\u636E\u5B57\u5178\u5728\u7CFB\u7EDF\u4E2D\u975E\u5E38\u91CD\u8981,\u60A8\u786E\u8BA4\u8981\u4FEE\u6539\u5417\uFF1F +dict_delete_info=\u6570\u636E\u5B57\u5178\u5728\u7CFB\u7EDF\u4E2D\u975E\u5E38\u91CD\u8981,\u60A8\u786E\u8BA4\u8981\u5220\u9664\u5417\uFF1F +dict_saveitem_error=\u4FDD\u5B58\u4FE1\u606F\u51FA\u73B0\u95EE\u9898,\u8BF7\u6DFB\u52A0\u8BCD\u6761\u9879\uFF01 +dict_saveitem_nullerror=\u4FDD\u5B58\u4FE1\u606F\u51FA\u73B0\u95EE\u9898,\u6BCF\u4E2A\u8BCD\u6761\u6807\u8BC6\u4E0E\u503C\u90FDCan't be empty\uFF01 +submit_error=\u63D0\u4EA4Configuration\u51FA\u73B0\u95EE\u9898,\u8BF7\u770B\u9519\u8BEF\u63D0\u793A\uFF01 +form_validate=\u8868\u5355\u9A8C\u8BC1\u6210\u529F\uFF01 +entry=\u8BCD\u6761\u9879 +add_entry=\u6DFB\u52A0\u8BCD\u6761 +click_add_entry=\u70B9\u51FB\u6DFB\u52A0\u8BCD\u6761 +maintainable=\u53EF\u7EF4\u62A4 +useable=\u53EF\u7528 +click_add=\u70B9\u51FB\u6DFB\u52A0 +menu_name=\u83DC\u5355Name +unicode=\u56FD\u9645\u5316\u7F16\u7801 +link=\u94FE\u63A5 +visible=\u53EF\u89C1 +permission_mark=\u6743\u9650\u6807\u8BC6 +display=\u663E\u793A +hide=\u9690\u85CF +add_child_menu=\u6DFB\u52A0\u4E0B\u7EA7\u83DC\u5355 +save=\u4FDD\u5B58 +save_sort=\u4FDD\u5B58\u6392\u5E8F +menu=\u83DC\u5355 +parent_menu=\u4E0A\u7EA7\u83DC\u5355 +aim=\u76EE\u6807 +click_menu_turn=\u70B9\u51FB\u83DC\u5355\u8DF3\u8F6C\u7684\u9875\u9762 +link_window_info=\u94FE\u63A5\u5730\u5740\u6253\u5F00\u7684\u76EE\u6807\u7A97\u53E3,\u9ED8\u8BA4\uFF1AmainFrame +is_top_menu=\u662F\u5426\u9876\u90E8\u5BFC\u822A\u83DC\u5355 +icon=\u56FE\u6807 +is_top_menu_info=\u8BE5\u83DC\u5355\u6216\u64CD\u4F5C\u662F\u5426\u9876\u90E8\u5BFC\u822A\u83DC\u5355 +sort_info=\u6392\u5217\u987A\u5E8F,\u5347\u5E8F. +is_show_sysmenu=\u8BE5\u83DC\u5355\u6216\u64CD\u4F5C\u662F\u5426\u663E\u793A\u5230\u7CFB\u7EDF\u83DC\u5355\u4E2D +control_permission_info=\u63A7\u5236\u5668\u4E2D\u5B9A\u4E49\u7684\u6743\u9650\u6807\u8BC6,\u5982\uFF1A@RequiresPermissions("\u6743\u9650\u6807\u8BC6") +role_name=\u89D2\u8272Name +data_range=\u6570\u636E\u8303\u56F4 +allot=\u5206\u914D +role_type=\u89D2\u8272Type +role_permission=\u89D2\u8272\u6743\u9650 +task_allot=\u4EFB\u52A1\u5206\u914D +role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4Type\uFF1Asecurity-role\u3001assignment\u3001user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1 +role_type_info=\u5DE5\u4F5C\u6D41\u7EC4\u7528\u6237\u7EC4Type\uFF08\u4EFB\u52A1\u5206\u914D\uFF1Aassignment\u3001 Management\u89D2\u8272\uFF1Asecurity-role\u3001\u666E\u901A\u89D2\u8272\uFF1Auser\uFF09 +data_range_info=\u7279\u6B8A\u60C5\u51B5\u4E0B,\u8BBE\u7F6E\u4E3A\u201C\u6309\u660E\u7EC6\u8BBE\u7F6E\u201D,\u53EF\u8FDB\u884C\u8DE8\u673A\u6784\u6388\u6743 +permission_list=\u6743\u9650\u5217\u8868 +area_name=\u533ADomain\u79F0 +area_code=\u533A\u57DF\u7F16\u7801 +area_type=\u533A\u57DFType +longitude=\u7ECF\u5EA6 +latitude=\u7EAC\u5EA6 + +role_list=Role List +role_allot=Role Assign +staff_list=User List +choose_and_allot=\u901A\u8FC7\u9009\u62E9\u90E8\u95E8,\u7136\u540E\u4E3A\u5217\u51FA\u7684\u4EBA\u5458\u5206\u914D\u89D2\u8272. +loading=\u6B63\u5728\u63D0\u4EA4,\u8BF7\u7A0D\u7B49... +remove=Remove +sure_remove_role=\u89D2\u8272\u5C06\u4ECE\u8BE5\u7528\u6237\u4E2D\u79FB\u9664\uFF1F +system_prompt=\u7CFB\u7EDF\u63D0\u793A +old_password=Old Password +new_password=New Password +sure_new_password=Confirm New Password +be_selected_staff=\u5F85\u9009\u4EBA\u5458 +selected_staff=\u5DF2\u9009\u4EBA\u5458 +old_remove_error=\u89D2\u8272\u539F\u6709\u6210\u5458\u4E0D\u80FD\u6E05\u9664\uFF01 +selected_clear_success=\u5DF2\u9009\u4EBA\u5458\u6E05\u9664\u6210\u529F\uFF01 +cancel_clear=\u53D6\u6D88\u6E05\u9664\u64CD\u4F5C\uFF01 +sure_clear=\u6E05\u9664\u786E\u8BA4 +role_no_new=\u89D2\u8272\u672A\u5206\u914D\u65B0\u6210\u5458\uFF01 +role_unique=\u89D2\u8272Name\u5DF2\u5B58\u5728 +role_error_info=\u8F93\u5165\u6709\u8BEF,\u8BF7\u5148\u66F4\u6B63. +user=User +organization=\u673A\u6784 +file_management=File Management +insert=Add #==========xitongguanli end====================== #===============multiole cfg start==================== -optional=optional -custom_region=custom region -please_input=please input -area_control_type=area control type -#===============multiole cfg end==================== -whitelist=whitelist -ip_whitelist=IP whitelist -domain_whitelist=domain whitelist -dns_ip_control=DNS IP control -dns_domain_control=DNS domain control -http_req_control=HTTP request control -http_ip_control=HTTP IP control -http_url_control=HTTP URL control -http_req_hdr_control=HTTP request header control -http_req_body_control=HTTP request body control -http_res_control=HTTP response control -http_res_hdr_control=HTTP response header control -http_res_body_control=HTTP response body control -av_control=av control -av_content_ip_control=content ip control -av_picture_ip_control=picture ip control -av_content_url_control=content url control -av_picture_url_control=picture url control -av_voip_control=VoIP control -av_voip_ip_control=VoIP IP control -av_voip_account_control=VoIP account control -av_sample_audio_control=audio sample control -av_sample_vedio_control=vedio sample control -av_sample_picture_control=picture sample control -av_sample_voip_control=VoIP sample control -av_sample_audio_porn_control=audio porn sample control -av_sample_vedio_porn_control=vedio porn sample control -av_sample_control=sample control -harm_level=harm level -src_file=src file -select_file=please select file -sample_file=sample file -sample_sign=sample sign -click_detail=please click\u201Cview detail\u201Dbutton\uFF0Cview detailed error information\uFF0Cthanks\uFF01 -return_lastpage=return last page -show_detail=view detail -hidden_detail=hide detail -notfound_page=not found page -no_permission=permission denied -param_error=param error,server can't analyze -request_service_failed=request server failed -request_error=request error +optional=Option +custom_region=Custom Region +please_input=Please enter +area_control_type=Area Control Type +#===============multiole cfg end==================== +whitelist=White List +ip_whitelist=IP White List +domain_whitelist=Domain White List +dns_ip_control=DNS IP Control +dns_domain_control=DNS Domain Control +http_req_control=HTTP Request Control +http_ip_control=HTTP IP Control +http_url_control=HTTP URL Control +http_req_hdr_control=HTTP Request Header Control +http_req_body_control=HTTP Request Body Control +http_res_control=HTTP Response Control +http_res_hdr_control=HTTP Response Header Control +http_res_body_control=HTTP Response Header Control +av_control=Multi-Media Control +av_content_ip_control=Content IP Control +av_picture_ip_control=Picture IP Control +av_content_url_control=Content URL Control +av_picture_url_control=Picture URL Control +av_voip_control=VoIP Control +av_voip_ip_control=VoIP IP Control +av_voip_account_control=VoIP Account Control +av_sample_audio_control=Audio Sample Control +av_sample_vedio_control=Vedio Sample Control +av_sample_picture_control=Picture Sample Control +av_sample_voip_control=VoIPSample Control +av_sample_audio_porn_control=Audio Porn Sign Sample Control +av_sample_vedio_porn_control=Vedio Porn Sign Sample Control +av_sample_control=Sample Control +harm_level=Degree of harm +src_file=Source File +select_file=Please Select Upload File +sample_file=Sample File +sample_sign=Sample Sign +click_detail=\u8BF7\u70B9\u51FB\u201C\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F\u201D\u6309\u94AE,\u5C06\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F\u53D1\u9001\u7ED9\u7CFB\u7EDF Management\u5458,\u8C22\u8C22\uFF01 +return_lastpage=\u8FD4\u56DE\u4E0A\u4E00\u9875 +show_detail=\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F +hidden_detail=\u9690\u85CF\u4FE1\u606F\u4FE1\u606F +notfound_page=\u9875\u9762\u4E0D\u5B58\u5728 +no_permission=\u6743\u9650\u4E0D\u8DB3 +param_error=\u53C2\u6570\u6709\u8BEF,\u670D\u52A1\u5668\u65E0\u6CD5\u89E3\u6790. +request_service_failed=\u8BF7\u6C42\u670D\u52A1\u63A5\u53E3\u5931\u8D25 +request_error=Request Error av_voip_ip_title=voip Ip av_voip_account_title=voip Account account=Account -ip_pattern=ip Pattern -port_pattern=port Pattern -port_mask=port Mask -ip_range=ip Range -ip_subnet=Subnet -district=match district -keywords=keywords -ingress=ingress -egress=egress +ip_pattern=IP Pattern +port_pattern=Port Pattern +port_mask=Port Mask +ip_range=IP Range +ip_subnet=IP Subnet +district=Matching District +keywords=Keyowrd +http_ip_title=HTTP IP Configuration +http_url_title=HTTP URL Configuration +http_req_hdr_title=HTTP Request Header Configuration +http_req_body_title=HTTP Request Body Configuration +http_res_hdr_title=HTTP Response Header Configuration +http_res_body_title=HTTP Response Body Configuration +ssl_ip=SSL IP Configuration +ssl_sni=SSL SNI Keyowrd Configuration +ssl_san=SSL SAN Keyowrd Configuration +ssl_ca=SSL CA Keyowrd Configuration +http_control=http Configuration +ingress=Ingress +egress=Egress +fileTransfer_control=File Transfer Configuration +mail_hdr=Mail Header Configuration +mail_body=Mail Content Configuration +mail_file_digest=Mail File Digest Configuration +ftp_url=FTP URL +ftp_content=FTP Content +mail_ip=Mail IP Configuration +ftp_ip=FTP IP Configuration +dns_ip=DNS IP Configuration +dns_domain=DNS Domain Configuration +action=action +has_prohibit_delete=Only unaudited configuration can by deleted +has_prohibit_nopass=Only unaudited configuration can by audited +has_prohibit_pass=Only unaudited configuration can by audited +multiple_keywords_tip=Multiple keyowrd can be input,Please separate it with the return key. action_drop=drop -action_reject=reject -action_redirect=\redirect +action_reject=block +action_redirect=redirect action_loop=loop action_forward=forward action_ratelimit=rate limit action_replace=replace -action_whitelist=white list -action_monit=monitor -file_digest_control=file digest control -bgp_control=bgp control +action_whitelist=White List +action_monit=Monit +file_digest_control=File Digest Control +raw_len=File Length +digest=Digest +cfds_level=Matching Confidence +file_url=File URL +bgp_control=BGP Control bgp_ip=bgp Ip -xmpp_control=xmpp control +xmpp_control=XMPP Control xmpp_ip=xmpp Ip #===============protocol IP Import start================= chooseFile=Choose File -download=Download -import_success=import success -import_error=import error -import_failed=Import data failed, -import_template_failed=Failure of template download,ths exception is : -the_line_of=the rowNum line -val_protocol_id=protocol Name is required or not exists -val_ip_type=ip type is required and the value mast 4(IPV4) or 6(IPV6) -val_src_ip=client ip format is incorrect or inconsistent with the ip type -val_src_mask=client ip format is incorrect or inconsistent with the ip type -val_src_port=client port is required and the value mast between 0 and 65535 -val_src_port_mask=client port mask is required and the value mast between 0 and 65535 -val_dst_ip=server ip format is incorrect or inconsistent with the ip type -val_dst_mask=server address mask format is incorrect or inconsistent with the ip type -val_dst_port=server port is required and the value mast between 0 and 65535 -val_dst_port_mask=server port mask is required and the value mast between 0 and 65535 -val_protocol=protocol is required and the value mast 6(tcp),17(udp),0(freedom) -val_direction=The value mast 0(bidirectional) or 1(unidirectional) - +download=Template Download +import_success=Import Success +import_error=Import Error +import_failed=Import Failed +import_template_failed=Failed to download the template\! Failure information\uFF1A +the_line_of=Line rowNum +val_protocol_id=Protocol name is empty or not exist +val_ip_type=IP Type Can't be empty,and should by 4(IPV4) or 6(IPV6) +val_src_ip=Client IP format is incorrect or inconsistent with IP type +val_src_mask=Client IP mask format is incorrect or inconsistent with IP type +val_src_port=Client port is empty or incorrectly formatting(0-65535) +val_src_port_mask=Client port mask format is incorrect(0-65535) +val_dst_ip=Server IP format is incorrect or inconsistent with IP type +val_dst_mask=Server IP mask format is incorrect or inconsistent with IP type +val_dst_port=Server port is empty or incorrectly formatting(0-65535) +val_dst_port_mask=Server port mask format is incorrect(0-65535) +val_protocol=Protocol Can't be empty,and should be 6(tcp),17(udp),0(\u4EFB\u610F) +val_direction=Direction should be 0(bidirectional) or 1(unidirectional) +#===============protocol IP Import end================= #===========log begin============= -log=log -cfg_id=cfg id -found_time=found time -recv_time=recvreceive time -protocol_type=protocol type -addr_type=addr type -serverip=server ip -clientip=client ip -serverport=server port -clientport=client port -entrance_id=entrance -deviceid=device -direct=direction -stream_type=stream type -clj_ip=processor ip -nest_addr_list=nest addr list -user_region=user region -version=version -encrypt_mode=encrypt mode -hmac=HMAC -tunnel_type=tunnel type -log_total=log total -host_key=host key -host_cookie=host cookie -mac=mac -ex_protocol=exchange protocol -isakmp_mode=ISAKMP mode -req_hdr_file=request header file -req_body_file=request body file -res_hdr_file=response header file -res_body_file=response body file -qr=QR -rd=RD -ra=RA -rr=RR -qtype=QTYPE -qclass=QCLASS +log=Log +cfg_id=ConfigurationID +found_time=Found Time +recv_time=Receive Time +protocol_type=Protocol Type +addr_type=IP Type +serverip=Server IP +clientip=Client IP +serverport=Server IP Port +clientport=Client IP Port +entrance_id=ISP +deviceid=Device +direct=Direction +stream_type=Stream Type +clj_ip=Processor IP +nest_addr_list=Nested address list +user_region=User Region +version=Version +encrypt_mode=Encrypt Mode +hmac=Is there any HMAC +tunnel_type=Tunnel Type +log_total=Log Number +host_key=Host Key +host_cookie=Host Cookie +mac=Message authentication code +ex_protocol=Exchange Protocol +isakmp_mode=ISAKMP Mode +req_hdr_file=Request header dump file +req_body_file=Request body dump file +res_hdr_file=Response header dump file +res_body_file=Response body dump file +qr=Request/Response +rd=Recursion Desired +ra=Available Recursion +rr=Resource Record +qtype=QType +qclass=QClass opcode=Opcode -qname=QNAME -cname=CNAME -dns_query=query -dns_response=response -entrance=entrance -ftp_url=ftp url -ftp_content=ftp content +qname=Query Content +cname=cname +dns_query=Request +dns_response=Response +entrance=\u51FA\u5165\u53E3 #dns_sub=DNS_SUB -mail_proto=mail protocol -mail_from=sender -mail_to=receiver -subject=subject -eml_file=EML file -contrl_tunnel=contrl tunnel -data_tunnel=data tunnel -contrl_message=contrl message -data_message=data message -user_name=user name +mail_proto=Mail Protocol +mail_from=Sender +mail_to=Recipient +subject=Subject +eml_file=EML File +contrl_tunnel=Control Tuunel +data_tunnel=Data Tuunel +contrl_message=Control Message +data_message=Data Message +user_name=User Name #===========log end ============= #=============about proxy========= -intercept_policy=intercept policy -ip_intercept=ip intercept -domain_intercept=domain intercept -control_policy=control policy -domain_forward=domain forward -http_redirect=http redirect -http_req_replace=http request replace -http_res_replace=http response replace -replace_content=replace content +intercept_policy=Intercept Policy +ip_intercept=IP Intercept +domain_intercept=Domain Intercept +control_policy=Control Policy +domain_forward=Domain Forward +http_redirect=Http Redirect +http_req_replace=Http Request Body Replace +http_res_replace=Http ResponseContent Replace +replace_content=Replace Content #=============about proxy========= #===========policy_group_manage start ============= -all_types=all types -group_type=group type -group_name=group name -policy_group_manage=strateagy grouping management +all_types=All Type +group_type=Group Type +group_name=Group Name +policy_group_manage=Policy Group Management #===========policy_group_manage end ============= #=============about manipulation========= -ip_multiplex_policy=ip multiplex policy -target_ip_protect=target ip protect -ratelimit_config=ratelimit config -ip_ratelimit=ip ratelimit -domain_ratelimit=domain ratelimit -ratelimit=ratelimit scale -ir_type=multiplex type -dns_strategy_id=dns strategy id +ip_Reuse_policy=IP Reuse Policy +target_ip_protectTarget IP Protect +ratelimit_config=Ratelimit Management +ip_ratelimit=IP Ratelimit +domain_ratelimit=Domain Ratelimit +ratelimit=Limit Rate +ir_type=Reuse type +dns_strategy_id=DNS Policy ID #=============about manipulation========= +#=============about app config=========== +domain=Domain +app_ip_config=APP Protocol ipConfiguration +bytes=byte +app_http_config=APP HTTP Feature Configuration +app_domain_config=APP Domain Feature Configuration +app_byte_config=APP Byte Feature Configuration +social_app=Social Applicaiton +app_policy_config=APP Policy Configuration +app_features_config=APP Feature Configuration +#=============about app config=========== #=============about Maintenance========= -ip_multiplex_pool_config=ip multiplex pool config -dns_res_strategy=dns response strategy -policy_number=policy number -policy_name=policy name -min_ttl=min ttl -max_ttl=max ttl -ttl_unit=unit/s -res_group_num=response number -policy_number_value_valid=policy number must be 0 or greater than 100 -policy_number_value_unique=policy number is exist +ip_Reuse_pool_config=IP Reuseing Pool Configuration +dns_res_strategy=DNS Response Policy No. +policy_number=Policy No. +policy_name=Policy Name +min_ttl=Minimum Active time +max_ttl=Maximum Active time +ttl_unit=Unit / second +res_group_num=Response Group Number +policy_number_value_valid=The policy number can only be 0, or more than 100 +policy_number_value_unique=The policy number has already existed #=============about Maintenance========= #=============some validation=========== line=line %s -can_not_null=%s must not be null -is_incorrect=%s is incorrect -are_the_same=%s and %s are the same -is_in_wrong_format=%s is in wrong format -must_between=must between %s and %s -not_number=%s is not a number -id_not_exists=the id %s of %s is not valid -num_split_by_comma=%s must be numbers split by comma -must_be=%s must be %s +can_not_null=%sCan't be empty +is_incorrect=%s value is incorrect +are_the_same=%s and %s can't be equal +is_in_wrong_format=%s formatting error +must_between=Must be between %s and %s +not_number=%s must be a number #=============some validation=========== +#=============region_value,config form title================= +av_sample_audio=Audio Sample +av_sample_vedio=Vedio Sample +av_sample_pitrue=Picture Sample +av_sample_voip=voipSample +av_sample_audio_porn=Audio Porn Sign Sample +av_sample_vedio_porn=Vedio Porn Sgin Sample +WHITE_LIST_IP=IP White List +av_voip_ip=voip ip Configuration +NTC_HTTP_URL=URL Configuration +NTC_HTTP_REQ_HDR=Request Header Keyowrd Configuration +NTC_HTTP_RES_HDR=Response Header Keyowrd Configuration +NTC_HTTP_REQ_BODY=Request Body Configuration +NTC_HTTP_RES_BODY=Response Body Configuration +NTC_UNIVERSAL_IP=IP Configuration +NTC_DNS_REGION=Keyowrd Configuration +WHITE_LIST_DOMAIN=Domain White List +av_voip_account=voip Account Configuration +av_cont_ip=Content IP Configuration +NTC_SSL_SNI=SNI Keyowrd Configuration +NTC_SSL_SAN=SAN Keyowrd Configuration +NTC_SSL_CA=CA Keyowrd Configuration +av_pic_ip=Picture IP Configuration +av_cont_url=Content URL Configuration +av_pic_url=Picture URL Configuration +NTC_IP=IPConfiguration +file_transfer_digest=File Transfer Digest Configuration +PXY_INTERCEPT_IP=IP Intercept Configuration +PXY_INTERCEPT_DOMAIN=Domain Intercept Configuration +PXY_CTRL_HTTP_REQ_BODY=Request Body Configuration +PXY_CTRL_HTTP_RES_BODY=Response Body Configuration +dns_fake_ip=DNS Spoofing IP Configuration +APP_POLICY=APP Policy Configuration +PXY_CTRL_IP=IP Control Configuration +APP_STATIC_SEV_IP=APP Protocol IP Configuration +APP_HTTP=APP HTTP Feature Configuration +APP_DOMAIN=APPDomain Feature Configuration +APP_PKT_BIN=APP Byte Feature Configuration +PXY_CTRL_HTTP_URL=URL Configuration +LIMIT_IP=IP RateLimit Configuration +IR_POLICY_IP=IP Reuseing Configuration +PXY_CTRL_HTTP_REQ_HDR=Request Header Keyowrd Configuration +PXY_CTRL_HTTP_RES_HDR=Response Header Keyowrd Configuration +DDOS_PROTECT_TARGET_IP_CB=Ddos IP Configuration +IR_STATIC_IP_POOL_CB=IP Reuseing Pool Configuration +NTC_MAIL_HDR=Header Keyowrd Configuration +NTC_MAIL_BODY=Content Configuration +NTC_FILE_DIGEST=File Digest Configuration +NTC_FTP_URL=URLConfiguration +FTP_CONTENT=ContentConfiguration +id_not_exists=id of %s %s is not exist +id_not_valid=id of %s %s is invalid +num_split_by_comma=%s is a character separated by a comma +no_data=Unrelated data +must_be=%s value must be %s +REDIRECT_RESPONSE_CODE=Redirect Response Code +permanet_redirect=Permanent Redirect +temporary_redirect=Temporary Redirect +prohibition_access=Prohibition Access +not_allowed_method=This method is not allowed to access +law_prohibition_access=It is not available for legal reasons +redirect_content=Redirect Content +#=============region_value,config form title================= #=============userregions=============== -userregion1=user region 1 -userregion2=user region 2 -userregion3=user region 3 -userregion4=user region 4 -userregion5=user region 5 +userregion1=\u81EA\u5B9A\u4E49\u57DF1 +userregion2=\u81EA\u5B9A\u4E49\u57DF2 +userregion3=\u81EA\u5B9A\u4E49\u57DF3 +userregion4=\u81EA\u5B9A\u4E49\u57DF4 +userregion5=\u81EA\u5B9A\u4E49\u57DF5 #=============userregions=============== #=============multipart upload error info================= -single_file_upload_size_error=The size of the file %s is %s,allowing the maximum value of a single file to be %s ! -total_file_upload_size_error=The total size of uploaded files is %s,allowing the total size of uploaded to be %s ! -file_upload_type_error=%s file type of error,allowing uploaded file type with %s! -file_upload_error=File upload failure ! -#=============multipart upload error info================= +single_file_upload_size_error=Filesize of file %s is %s,Allow the maximum value of a single file to be %s\uFF01 +total_file_upload_size_error=The maximum size of the uploaded file is %s,The total size of the file allowed to upload is %s\uFF01 +file_upload_type_error=%s file type is incorrect,Allow uploaded files type contains %s\uFF01 +file_upload_error=File upload failure\uFF01 +#=============multipart upload error info================= \ No newline at end of file From 7319513775184ef14ce399da4da9c70a2d042ba0 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 10 Jul 2018 17:26:43 +0800 Subject: [PATCH 3/7] =?UTF-8?q?NtcPzReport=E7=A7=BB=E5=8A=A8=E5=88=B0repor?= =?UTF-8?q?t=E5=8C=85=E4=B8=8B=EF=BC=8C=E8=B7=AF=E5=BE=84=E6=94=B9?= =?UTF-8?q?=E4=B8=BAreport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{log/ntc => report}/NtcPzReportController.java | 5 +++-- src/main/webapp/static/global/scripts/common.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename src/main/java/com/nis/web/controller/{log/ntc => report}/NtcPzReportController.java (94%) diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java similarity index 94% rename from src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java rename to src/main/java/com/nis/web/controller/report/NtcPzReportController.java index 95c907cb3..4ef885ab1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java @@ -6,7 +6,7 @@ *@date 2018年6月12日 下午2:09:41 *@version 版本号 */ -package com.nis.web.controller.log.ntc; +package com.nis.web.controller.report; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -37,7 +37,7 @@ import com.nis.web.controller.BaseController; * @version V1.0 */ @Controller -@RequestMapping("${adminPath}/logs") +@RequestMapping("${adminPath}/report") public class NtcPzReportController extends BaseController{ @RequestMapping(value="ajaxGetLogTotal",method=RequestMethod.POST) @ResponseBody @@ -69,4 +69,5 @@ public class NtcPzReportController extends BaseController{ // } return data; } + } diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 0ec31e514..a0f73a832 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -767,7 +767,7 @@ var GetLogTotal=function(data){ var request=$.ajax({ type:'post', timeout:1000,//超时时间设置，查询接口时间过长超时 - url:pathName+'/logs/ajaxGetLogTotal', + url:pathName+'/report/ajaxGetLogTotal', data:{"endTime":timeStamp,"action":data.action,"functionId":data.functionId,"compileId":data.compileId}, dataType:'json', async:true, From 37b358eecbc35ecb75733778bb965e36071a2065 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 10 Jul 2018 17:50:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?IP=E5=A4=8D=E7=94=A8=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=B1=A0=E5=AE=A1=E6=A0=B8=E6=9D=83=E9=99=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/maintenance/IpMultiplexPoolCfgController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index a0bc4e9da..30bfd4288 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java @@ -97,7 +97,7 @@ public class IpMultiplexPoolCfgController extends BaseController { } @RequestMapping(value = {"/audit"}) - //@RequiresPermissions(value={"ip:mulitiplex:pool:audit"}) + @RequiresPermissions(value={"ip:mulitiplex:pool:audit"}) public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); From e989f78fe6b2130382275fce37f71037b00d0773 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Wed, 11 Jul 2018 13:50:24 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.report=E5=89=8D=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E9=A1=B5=202.report=E7=9A=84=E6=97=B6=E9=97=B4=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=88=E5=BD=93=E6=97=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/BaseController.java | 3 + .../NtcSrcipDomesticReportController.java | 1 + .../report/NtcTagReportController.java | 1 + .../webapp/WEB-INF/include/form/pageGroup.jsp | 146 ++++++++++++++++++ .../webapp/WEB-INF/views/report/label.jsp | 8 +- src/main/webapp/WEB-INF/views/report/list.jsp | 8 +- .../webapp/WEB-INF/views/report/srcIp.jsp | 10 +- 7 files changed, 163 insertions(+), 14 deletions(-) create mode 100644 src/main/webapp/WEB-INF/include/form/pageGroup.jsp diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 56e7bb5df..0423c13ce 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -337,6 +337,9 @@ public class BaseController { protected void initReportCondition(Model model,SearchReport report){ List serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId()); model.addAttribute("serviceList", serviceList); + if (StringUtils.isBlank(report.getReportTime())) { + report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd")); + } } protected void initFormCondition(Model model){ List requestInfos=requestInfoService.getValidRequestInfo(); diff --git a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java index 7ed1ceebb..1c8e725bb 100644 --- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java @@ -133,6 +133,7 @@ public class NtcSrcipDomesticReportController extends BaseController { } model.addAttribute("splitor", Constants.REPORT_TRIM_CONNECTOR); model.addAttribute("datas", showData); + model.addAttribute("dataLength", showData.size()); return "/report/srcIp"; } } diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java index d31d973c2..f897c4792 100644 --- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java @@ -125,6 +125,7 @@ public class NtcTagReportController extends BaseController { showData.put(label.getServiceDictId().toString(), _line); } model.addAttribute("datas", showData); + model.addAttribute("dataLength", showData.size()); return "/report/label"; } } diff --git a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp new file mode 100644 index 000000000..173bd4a46 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp @@ -0,0 +1,146 @@ +<%@ 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/report/label.jsp b/src/main/webapp/WEB-INF/views/report/label.jsp index 46a92074c..d50ee4e82 100644 --- a/src/main/webapp/WEB-INF/views/report/label.jsp +++ b/src/main/webapp/WEB-INF/views/report/label.jsp @@ -1,9 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> - +<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> +<%-- --%> @@ -29,4 +27,4 @@ $(function(){
-
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 51c2d88c1..e37a6a9bb 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -109,7 +109,8 @@ var ajaxReport=function(url,target){ $.ajax({ type:'post', async:false, - url:'${ctx}'+url,///report/ajaxNtcTagReport + cache:false, + url:'${ctx}'+url+"?random="+Math.random,///report/ajaxNtcTagReport data:{ "action":$('[name="action"]').val(), "reportType":$('[name="reportType"]').val(), @@ -118,10 +119,11 @@ var ajaxReport=function(url,target){ dataType:"html", success:function(data){ $(target).html(data);//#label + pagination(); closeTip(); } - }); -} + }); +}; diff --git a/src/main/webapp/WEB-INF/views/report/srcIp.jsp b/src/main/webapp/WEB-INF/views/report/srcIp.jsp index be44c3c08..c5eda3462 100644 --- a/src/main/webapp/WEB-INF/views/report/srcIp.jsp +++ b/src/main/webapp/WEB-INF/views/report/srcIp.jsp @@ -1,9 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> - +<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> +<%-- --%> @@ -25,7 +23,7 @@ $(function(){ - +
${cloumn}
-
${page}
+
From 84338393d9d6148b3d4be17bfc9a3894a0dd7a9d Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 11 Jul 2018 14:20:01 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=96=87=E4=BB=B6=E6=A0=B7=E4=BE=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=A1=A8=E5=8D=95=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=B7=E4=BE=8B=E6=96=87=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=8C=E6=94=B9=E7=94=B1=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=A4=96=E9=83=A8=E7=A8=8B=E5=BA=8F=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A0=B7=E4=BE=8B=E6=96=87=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- .../domain/configuration/AvFileSampleCfg.java | 15 ++ src/main/java/com/nis/util/Constants.java | 9 +- .../configuration/ntc/AvController.java | 54 ++++--- .../nis/web/dao/configuration/AvCfgDao.xml | 9 +- .../service/configuration/AvCfgService.java | 145 ++++++++++++++++++ .../resources/messages/message_en.properties | 2 +- .../messages/message_zh_CN.properties | 2 +- src/main/resources/nis.properties | 26 +++- src/main/resources/spring-mvc.xml | 4 +- .../WEB-INF/views/cfg/av/fileSampleForm.jsp | 50 ++++-- 10 files changed, 270 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java index f130e5387..7e6a9fccc 100644 --- a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java @@ -27,6 +27,8 @@ public class AvFileSampleCfg extends BaseCfg { private Integer compileId; private String srcPath; private String samplePath; + private Integer isSampleCreated; + private String resultPath; public String getSrcPath() { return srcPath; @@ -76,4 +78,17 @@ public class AvFileSampleCfg extends BaseCfg { public void setLevel(Integer level) { this.level = level; } + public Integer getIsSampleCreated() { + return isSampleCreated; + } + public void setIsSampleCreated(Integer isSampleCreated) { + this.isSampleCreated = isSampleCreated; + } + public String getResultPath() { + return resultPath; + } + public void setResultPath(String resultPath) { + this.resultPath = resultPath; + } + } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 56464ba8b..6c74e7fbf 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -434,11 +434,18 @@ public final class Constants { public static final String AV_FILE_PATH = Configurations.getStringProperty("av_file_path", "/home/ysp/"); public static final String AV_SAMPLE_AUDIO_REGION = Configurations.getStringProperty("av_sample_audio_region", "av_sample_audio"); public static final String AV_SAMPLE_VEDIO_REGION = Configurations.getStringProperty("av_sample_vedio_region", "av_sample_vedio"); - public static final String AV_SAMPLE_PITURE_REGION = Configurations.getStringProperty("av_sample_pitrue_region", "av_sample_pitrue"); + public static final String AV_SAMPLE_PICTURE_REGION = Configurations.getStringProperty("av_sample_picture_region", "av_sample_picture"); public static final String AV_SAMPLE_VOIP_REGION = Configurations.getStringProperty("av_sample_voip_region", "av_sample_voip"); public static final String AUDIO_SAMPLE_CREATE_PROC = Configurations.getStringProperty("audio_sample_create_proc", "./audio_convert_proc"); public static final String VEDIO_SAMPLE_CREATE_PROC = Configurations.getStringProperty("vedio_sample_create_proc", "./vedio_convert_proc"); public static final String PICTURE_SAMPLE_CREATE_PROC = Configurations.getStringProperty("picture_sample_create_proc", "./picture_convert_proc"); + public static final boolean AUDIO_SAMPLE_PROC_PARAM_IS_QUOTATION = Configurations.getBooleanProperty("audio_sample_proc_param_is_quotation", true); + public static final boolean VEDIO_SAMPLE_PROC_PARAM_IS_QUOTATION = Configurations.getBooleanProperty("vedio_sample_proc_param_is_quotation", true); + public static final boolean PICTURE_SAMPLE_PROC_PARAM_IS_QUOTATION = Configurations.getBooleanProperty("picture_sample_proc_param_is_quotation", true); + public static final boolean AUDIO_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("audio_sample_proc_param_is_translation", false); + public static final boolean VEDIO_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("vedio_sample_proc_param_is_translation", false); + public static final boolean PICTURE_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("picture_sample_proc_param_is_translation", false); + //HTTP自定义域相关参数 public static String HTTP_HEADER_USER_REGION_KEY=Configurations.getStringProperty("http_header_user_region_key", "HTTP_HEADER"); public static String HTTP_HEADER_DICT_MODULE=Configurations.getStringProperty("http_header_dict_module", "REQUEST_HEADER_DISTRICT"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 2ae8137d1..61c8f5a74 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -1,6 +1,9 @@ package com.nis.web.controller.configuration.ntc; +import java.io.BufferedReader; import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.lang.reflect.Type; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -39,6 +42,7 @@ import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; +import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.FileUtils; import com.nis.util.JsonMapper; @@ -107,33 +111,45 @@ public class AvController extends BaseController { public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes, String ids,AvFileSampleCfg entity,MultipartFile srcFile,MultipartFile sampleFile){ try{ - if(srcFile!=null && sampleFile!=null && - srcFile.getSize()>0 && sampleFile.getSize()>0){ - +// if(srcFile!=null && sampleFile!=null && +// srcFile.getSize()>0 && sampleFile.getSize()>0){ + if(srcFile!=null && srcFile.getSize()>0){ String sep = System.getProperty("file.separator"); - String srcFilePath = request.getRealPath("/")+"srcFile"; - String sampleFilePath = request.getRealPath("/")+"sampleFile"; + String srcFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"srcFile";//源文件保存路径 + String sampleFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"sampleFile";//样例文件保存路径 + String resultFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"resultFile";//结果文件保存路径 FileUtils.createDirectory(srcFilePath); FileUtils.createDirectory(sampleFilePath); - String srcFileName = UUID.randomUUID()+FileUtils.getSuffix(srcFile.getOriginalFilename(), true); - String sampleFileName = UUID.randomUUID()+FileUtils.getSuffix(sampleFile.getOriginalFilename(), true); - File uploadSrcFile = new File(srcFilePath+sep+srcFileName); - File uploadSampleFile = new File(sampleFilePath+sep+sampleFileName); - FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile); - FileCopyUtils.copy(sampleFile.getBytes(),uploadSampleFile); + + String fileName = UUID.randomUUID()+""; + String srcFileAllPath = srcFilePath+sep+fileName+FileUtils.getSuffix(srcFile.getOriginalFilename(), true); + String sampleFileAllPath = sampleFilePath+sep+fileName+".sample"; + String resultFileAllPath = resultFilePath+sep+fileName+".result"; + entity.setSrcPath(srcFileAllPath); + entity.setSamplePath(sampleFileAllPath); + entity.setResultPath(resultFileAllPath); + + File uploadSrcFile = new File(srcFileAllPath); + File uploadSampleFile = new File(sampleFileAllPath); + FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);//保存源文件 String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath(); - String srcUrl = host+"/srcFile/"+uploadSrcFile.getName(); - String sampleUrl = host+"/sampleFile/"+uploadSampleFile.getName(); + String srcUrl = host+srcFilePath.substring(srcFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSrcFile.getName(); + String sampleUrl = host+sampleFilePath.substring(sampleFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSampleFile.getName(); + srcUrl = srcUrl.replace("\\", "/"); + sampleUrl = sampleUrl.replace("\\", "/"); logger.info("srcUrl:"+srcUrl); logger.info("sampleUrl:"+sampleUrl); - String srcMd5 = FileUtils.getFileMD5(uploadSrcFile); - String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile); entity.setSrcUrl(srcUrl); - entity.setSrcPath(uploadSrcFile.getPath()); entity.setSampleUrl(sampleUrl); - entity.setSamplePath(uploadSampleFile.getPath()); - entity.setSrcMd5(srcMd5); - entity.setSampleMd5(sampleMd5); + +// File uploadSrcFile = new File(srcFilePath); +// FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile); +// String srcMd5 = FileUtils.getFileMD5(uploadSrcFile); +// File uploadSampleFile = new File(sampleFilePath); +// String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile); + +// entity.setSrcMd5(srcMd5); +// entity.setSampleMd5(sampleMd5); } avCfgService.saveOrUpdateAvFileSample(entity); diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index 26c61af20..58edbb36d 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -297,7 +297,8 @@ SRC_URL,SAMPLE_URL, SRC_MD5,SAMPLE_MD5,LEVEL,CFG_DESC,ACTION,IS_VALID,IS_AUDIT, CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, - ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,function_id,cfg_type,cfg_region_code,src_path,sample_path + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,function_id,cfg_type,cfg_region_code,src_path,sample_path, + is_sample_created )values ( #{srcUrl,jdbcType=VARCHAR},#{sampleUrl,jdbcType=VARCHAR},#{srcMd5,jdbcType=VARCHAR}, #{sampleMd5,jdbcType=VARCHAR},#{level,jdbcType=INTEGER},#{cfgDesc,jdbcType=VARCHAR},#{action,jdbcType=INTEGER}, @@ -307,7 +308,8 @@ #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER}, - #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{srcPath,jdbcType=VARCHAR},#{samplePath,jdbcType=VARCHAR} + #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{srcPath,jdbcType=VARCHAR},#{samplePath,jdbcType=VARCHAR}, + #{isSampleCreated,jdbcType=INTEGER} ) @@ -403,6 +405,9 @@ sample_path = #{samplePath,jdbcType=VARCHAR}, + + is_sample_created = #{isSampleCreated,jdbcType=INTEGER}, + src_md5 = #{srcMd5,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index aa16ed5fd..4316e7d6e 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -2,15 +2,20 @@ package com.nis.web.service.configuration; +import java.io.BufferedReader; import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.lang.StringEscapeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +28,7 @@ import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; +import com.nis.util.Constants; import com.nis.util.FileUtils; import com.nis.util.StringUtil; import com.nis.web.dao.configuration.AvCfgDao; @@ -86,7 +92,77 @@ public class AvCfgService extends BaseService{ } if(compileId!=0){ entity.setCompileId(compileId); + entity.setIsSampleCreated(0); + File uploadSrcFile = new File(entity.getSrcPath()); + String srcMd5 = FileUtils.getFileMD5(uploadSrcFile); + entity.setSrcMd5(srcMd5); avCfgDao.insertAvFileSample(entity); + + //调用外部脚本，生成样例文件 + List list = new ArrayList(); + Map map = new HashMap(); + map.put("srcFile", entity.getSrcPath()); + map.put("dstFile", entity.getSamplePath()); + map.put("resultFile", entity.getResultPath()); + map.put("fileId", entity.getCfgId()); + list.add(map); + String param = gsonToJson(list); + String sampleCreatelProc = ""; + if(entity.getCfgType().equals(Constants.AV_SAMPLE_AUDIO_REGION)|| + entity.getCfgType().equals(Constants.AV_SAMPLE_VOIP_REGION)){//音频样例配置或VOIP样例配置 + sampleCreatelProc = Constants.AUDIO_SAMPLE_CREATE_PROC; + if(Constants.AUDIO_SAMPLE_PROC_PARAM_IS_TRANSLATION){ + param = StringEscapeUtils.escapeJava(param); + } + if(Constants.AUDIO_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理 + param = "'"+param+"'"; + } + }else if(entity.getCfgType().equals(Constants.AV_SAMPLE_VEDIO_REGION)){//视频样例配置 + sampleCreatelProc = Constants.VEDIO_SAMPLE_CREATE_PROC; + if(Constants.VEDIO_SAMPLE_PROC_PARAM_IS_TRANSLATION){ + param = StringEscapeUtils.escapeJava(param); + } + if(Constants.VEDIO_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理 + param = "'"+param+"'"; + } + }else if(entity.getCfgType().equals(Constants.AV_SAMPLE_PICTURE_REGION)){//图片样例配置 + sampleCreatelProc = Constants.PICTURE_SAMPLE_CREATE_PROC; + if(Constants.PICTURE_SAMPLE_PROC_PARAM_IS_TRANSLATION){ + param = StringEscapeUtils.escapeJava(param); + } + if(Constants.PICTURE_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理 + param = "'"+param+"'"; + } + } + + logger.info("调用外部程序输入参数："+param); + Map resultMap = execShell(sampleCreatelProc,param); + logger.info("调用外部程序结果："+resultMap); + + if(resultMap.get("exitStatus").equals(0)){//调用外部程序成功 + String out = resultMap.get("out").toString();//输出参数 + JSONArray resArray =JSONArray.fromObject(out); + JSONObject resObject = resArray.getJSONObject(0); + logger.info("调用外部程序输出参数："+resObject); + int state = resObject.getInt("state"); + int fileSize = resObject.getInt("fileSize"); + Integer fileId = resObject.getInt("fileId"); + if(state==1 && fileSize>0){//成功 + entity.setIsSampleCreated(1);//样例文件创建成功 + }else{ + entity.setIsSampleCreated(-1);//样例文件创建失败 + } + if(fileId.equals(entity.getCfgId().intValue())){ + File uploadSampleFile = new File(entity.getSamplePath()); + String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile); + entity.setSampleMd5(sampleMd5); + avCfgDao.updateAvFileSample(entity); + }else{ + logger.info("调用外部程序返回fileId错误,输入的fileId为："+entity.getCfgId()+",输出的fileId为："+fileId); + } + }else{ + throw new MaatConvertException(resultMap.get("error")!=null?resultMap.get("error").toString():resultMap.get("message").toString()); + } }else{ throw new MaatConvertException(""); } @@ -212,4 +288,73 @@ public class AvCfgService extends BaseService{ } } + /** + * 调用shell脚本 返回运行结果 + * + * @param shellName + * @param params + * @return + */ + public Map execShell(String shellName, + String... params) { + Map result = new HashMap(); + StringBuilder sb = new StringBuilder(); + sb.append(shellName); + for (String temp : params) { + sb.append(" " + temp); + } + String os = System.getProperty("os.name").toLowerCase(); + String cmd1 = ""; + String cmd2 = ""; + if(os.contains("windows")){ + cmd1 = "cmd.exe"; + cmd2 = "/c"; + }else{ + cmd1 = "/bin/sh"; + cmd2 = "-c"; + } + logger.info("调用脚本信息,cmd1:"+cmd1+",cmd2:"+cmd2); + String cmdarray[] = new String[] {cmd1, cmd2 ,sb.toString() }; + BufferedReader br = null; + BufferedReader bre = null; + try { + Process exec = Runtime.getRuntime().exec(cmdarray); + exec.getInputStream(); + br = new BufferedReader( + new InputStreamReader(exec.getInputStream())); + bre = new BufferedReader(new InputStreamReader( + exec.getErrorStream())); + String s = null; + StringBuilder out = new StringBuilder(); + while ((s = br.readLine()) != null) { + out.append(s); + } + result.put("out", out.toString());//输出参数 + out.setLength(0);//清空 + while ((s = bre.readLine()) != null) { + out.append(s); + } + result.put("error", out.toString());//错误信息 + int waitFor = exec.waitFor(); + logger.info("调用脚本:"+shellName+",执行返回状态值："+waitFor); + result.put("exitStatus", waitFor);//执行状态 + } catch (Exception e) { + e.printStackTrace(); + logger.error("调用 " + shellName + " 脚本异常", e); + } finally { + if (br != null) + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + if (bre != null) + try { + bre.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return result; + } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index f78624e89..93dc8a338 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -772,7 +772,7 @@ not_number=%s must be a number #=============region_value,config form title================= av_sample_audio=Audio Sample av_sample_vedio=Vedio Sample -av_sample_pitrue=Picture Sample +av_sample_picture=Picture Sample av_sample_voip=voipSample av_sample_audio_porn=Audio Porn Sign Sample av_sample_vedio_porn=Vedio Porn Sgin Sample diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index ddb0e0d93..90acf6e1a 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -772,7 +772,7 @@ not_number=%s\u5FC5\u987B\u4E3A\u6570\u5B57 #=============region_value,config form title================= av_sample_audio=\u97F3\u9891\u6837\u4F8B av_sample_vedio=\u89C6\u9891\u6837\u4F8B -av_sample_pitrue=\u56FE\u7247\u6837\u4F8B +av_sample_picture=\u56FE\u7247\u6837\u4F8B av_sample_voip=voip\u6837\u4F8B av_sample_audio_porn=\u97F3\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B av_sample_vedio_porn=\u89C6\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index b99f71e81..caa632ee4 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -331,16 +331,32 @@ digest_single_file_max_size=10485760 #12M12582912 digest_total_file_max_size=12582912 #YSP文件保存路径 -av_file_path=d:\\ysp\\ +av_file_path=/home/ysp/ +#av_file_path=D:\\ysp\\ #YSP文件特征类型 av_sample_audio_region=av_sample_audio av_sample_vedio_region=av_sample_vedio -av_sample_pitrue_region=av_sample_pitrue +av_sample_picture_region=av_sample_picture av_sample_voip_region=av_sample_voip #样例文件生成程序 -audio_sample_create_proc=java -jar d:\\sampleTest.jar -vedio_sample_create_proc=java -jar d:\\sampleTest.jar -picture_sample_create_proc=java -jar d:\\sampleTest.jar +audio_sample_create_proc=java -jar /home/sampleTest.jar +vedio_sample_create_proc=java -jar /home/sampleTest.jar +picture_sample_create_proc=java -jar /home/sampleTest.jar +audio_sample_proc_param_is_quotation=true +vedio_sample_proc_param_is_quotation=true +picture_sample_proc_param_is_quotation=true +audio_sample_proc_param_is_translation=false +vedio_sample_proc_param_is_translation=false +picture_sample_proc_param_is_translation=false +#audio_sample_create_proc=java -jar D:\\sampleTest.jar +#vedio_sample_create_proc=java -jar D:\\sampleTest.jar +#picture_sample_create_proc=java -jar D:\\sampleTest.jar +#audio_sample_proc_param_is_quotation=false +#vedio_sample_proc_param_is_quotation=false +#picture_sample_proc_param_is_quotation=false +#audio_sample_proc_param_is_translation=true +#vedio_sample_proc_param_is_translation=true +#picture_sample_proc_param_is_translation=true #http自定义域相关参数 http_header_user_region_key=HTTP_HEADER http_header_dict_module=REQUEST_HEADER_DISTRICT diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index 749430c00..fd5a1bea0 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -34,10 +34,10 @@ cache-period="31536000" /> - + cache-period="31536000" /> --> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index d8aa6bde3..cd6d17173 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -31,12 +31,12 @@ $(function(){ $("#srcFile").on('change',function(){ $("#srcFileInfo").val($("#srcFile").val()); }); - $("#uploadSample,#sampleFileInfo").on('click',function(){ + /* $("#uploadSample,#sampleFileInfo").on('click',function(){ $("#sampleFile").trigger("click"); }); $("#sampleFile").on('change',function(){ $("#sampleFileInfo").val($("#sampleFile").val()); - }); + }); */ $("input[name='areaType']").on('change',function(){ var val=$(this).val(); if($(this).is(":visible")){ @@ -62,16 +62,16 @@ $(function(){ $("#cfgFrom").validate({ submitHandler: function(form){ var srcFile = $("#srcFile").val(); - var sampleFile = $("#sampleFile").val(); + //var sampleFile = $("#sampleFile").val(); var srcUrl = $("#srcUrl").val(); - var sampleUrl = $("#sampleUrl").val(); + //var sampleUrl = $("#sampleUrl").val(); if((srcUrl==null||srcUrl=="") && (srcFile==null || srcFile=="")){ $("div[for='srcFile']").append(""); return false; - }else if((sampleUrl==null || sampleUrl=="") && (sampleFile==null || sampleFile=="")){ + }/* else if((sampleUrl==null || sampleUrl=="") && (sampleFile==null || sampleFile=="")){ $("div[for='sampleFile']").append(""); return false; - }else{ + } */else{ loading('onloading...'); form.submit(); } @@ -164,11 +164,11 @@ $(function(){
-
+ <%--
- <%-- --%> +
- <%-- ${_cfg.srcUrl } --%> + ${_cfg.srcUrl }
- <%-- - ${_cfg.sampleUrl } --%> + + ${_cfg.sampleUrl }
-
- - -
+
--%>
@@ -212,6 +209,29 @@ $(function(){
+ <%--
+
+
+ +
+ + + +
+
+
+
+
--%> <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> From f067b24fba48075845e0c3c32eb530373de54432 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Wed, 11 Jul 2018 15:38:37 +0800 Subject: [PATCH 7/7] =?UTF-8?q?report=E5=89=8D=E7=AB=AF=E5=88=86=E9=A1=B5b?= =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NtcSrcipDomesticReportController.java | 1 - .../report/NtcTagReportController.java | 1 - .../webapp/WEB-INF/include/form/pageGroup.jsp | 8 ++--- .../webapp/WEB-INF/views/report/label.jsp | 28 +++++++++------- src/main/webapp/WEB-INF/views/report/list.jsp | 5 ++- src/main/webapp/WEB-INF/views/report/lwhh.jsp | 32 +++++++++++-------- .../webapp/WEB-INF/views/report/srcIp.jsp | 26 +++++++++------ 7 files changed, 57 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java index 1c8e725bb..7ed1ceebb 100644 --- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java @@ -133,7 +133,6 @@ public class NtcSrcipDomesticReportController extends BaseController { } model.addAttribute("splitor", Constants.REPORT_TRIM_CONNECTOR); model.addAttribute("datas", showData); - model.addAttribute("dataLength", showData.size()); return "/report/srcIp"; } } diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java index f897c4792..d31d973c2 100644 --- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java @@ -125,7 +125,6 @@ public class NtcTagReportController extends BaseController { showData.put(label.getServiceDictId().toString(), _line); } model.addAttribute("datas", showData); - model.addAttribute("dataLength", showData.size()); return "/report/label"; } } diff --git a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp index 173bd4a46..fbe36812c 100644 --- a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp +++ b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp @@ -5,15 +5,15 @@ function pagination() { pageNo = 1; count = $('tbody').children().size();// 总记录数 - //处理ajax时jquery选择器缓存的问题 - dataLength = "${dataLength}"; +/* dataLength = "${fn:length(datas)}"; preCount = 0; if (dataLength < count) { preCount = count - dataLength; count = count - preCount; - } - $('tbody').children().slice(0, preCount).remove(); + alert(count) + //$('tbody').children().slice(0, preCount).remove(); + } */ pageSize = 30; // 页面大小 diff --git a/src/main/webapp/WEB-INF/views/report/label.jsp b/src/main/webapp/WEB-INF/views/report/label.jsp index d50ee4e82..1f788094c 100644 --- a/src/main/webapp/WEB-INF/views/report/label.jsp +++ b/src/main/webapp/WEB-INF/views/report/label.jsp @@ -1,7 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> <%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> -<%-- --%> @@ -13,18 +12,25 @@ - - -
- - ${label.itemValue} +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index e37a6a9bb..af05fc72c 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -105,7 +105,7 @@ } var ajaxReport=function(url,target){ - loading(''); + //loading(''); $.ajax({ type:'post', async:false, @@ -119,8 +119,7 @@ var ajaxReport=function(url,target){ dataType:"html", success:function(data){ $(target).html(data);//#label - pagination(); - closeTip(); + //closeTip(); } }); }; diff --git a/src/main/webapp/WEB-INF/views/report/lwhh.jsp b/src/main/webapp/WEB-INF/views/report/lwhh.jsp index 6f241d27d..9cd990212 100644 --- a/src/main/webapp/WEB-INF/views/report/lwhh.jsp +++ b/src/main/webapp/WEB-INF/views/report/lwhh.jsp @@ -1,9 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> - +<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> @@ -15,18 +12,25 @@ $(function(){ - - -
- - ${lwhh.requestTitle} +
${page}
diff --git a/src/main/webapp/WEB-INF/views/report/srcIp.jsp b/src/main/webapp/WEB-INF/views/report/srcIp.jsp index c5eda3462..86c65ff27 100644 --- a/src/main/webapp/WEB-INF/views/report/srcIp.jsp +++ b/src/main/webapp/WEB-INF/views/report/srcIp.jsp @@ -1,7 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> <%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> -<%-- --%> @@ -14,16 +13,23 @@ - - - - +
${location}