diff --git a/sqlupdate/update_video_spell_error.sql b/sqlupdate/update_video_spell_error.sql new file mode 100644 index 000000000..f7a698511 --- /dev/null +++ b/sqlupdate/update_video_spell_error.sql @@ -0,0 +1,2 @@ +update function_region_dict t set t.config_region_value=insert(t.config_region_value,POSITION('vedio' in t.config_region_value),5,'video') where t.config_region_value like '%vedio%'; +update sys_menu s set s.`code`=insert(s.`code`,POSITION('vedio' in s.`code`),5,'video') where s.`code` like '%vedio%'; diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 55d124bec..76ce20e23 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -491,17 +491,17 @@ public final class Constants { //YSP文件特征配置相关参数，用于调用外部程序生成特征文件时使用 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_VIDEO_REGION = Configurations.getStringProperty("av_sample_video_region", "av_sample_video"); 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 VIDEO_SAMPLE_CREATE_PROC = Configurations.getStringProperty("video_sample_create_proc", "./video_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 VIDEO_SAMPLE_PROC_PARAM_IS_QUOTATION = Configurations.getBooleanProperty("video_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 VIDEO_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("video_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自定义域相关参数 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 2402e942c..8f5d709ce 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -151,12 +151,12 @@ public class AvCfgService extends BaseService{ 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){ + }else if(entity.getCfgType().equals(Constants.AV_SAMPLE_VIDEO_REGION)){//视频样例配置 + sampleCreatelProc = Constants.VIDEO_SAMPLE_CREATE_PROC; + if(Constants.VIDEO_SAMPLE_PROC_PARAM_IS_TRANSLATION){ param = StringEscapeUtils.escapeJava(param); } - if(Constants.VEDIO_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理 + if(Constants.VIDEO_SAMPLE_PROC_PARAM_IS_QUOTATION){//json参数是否需要前后单引号处理 param = "'"+param+"'"; } }else if(entity.getCfgType().equals(Constants.AV_SAMPLE_PICTURE_REGION)){//图片样例配置 diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index 1ff053c22..fd25cca45 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -1,13 +1,13 @@ #jdbc for oracle #jdbc.driver=oracle.jdbc.driver.OracleDriver jdbc.devlop.driver=com.mysql.jdbc.Driver -jdbc.devlop.url=jdbc:mysql://10.0.6.249:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +jdbc.devlop.url=jdbc:mysql://10.0.6.249:3306/gwall_0716?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull jdbc.devlop.username=root jdbc.devlop.key=pR3JFt5dsGCW0nZO3TLF7Q== jdbc.devlop.password=JgW5tsiGBNAtcqCgSQIP0g== jdbc.product.driver=com.mysql.jdbc.Driver -jdbc.product.url=jdbc:mysql://10.0.6.249:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +jdbc.product.url=jdbc:mysql://10.0.6.249:3306/gwall_0716?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull jdbc.product.username=root jdbc.product.key=pR3JFt5dsGCW0nZO3TLF7Q== jdbc.product.password=JgW5tsiGBNAtcqCgSQIP0g== diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index a344376cd..5222f1746 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -397,7 +397,7 @@ login=Login owner_company=\u5F52\u5C5E\u516C\u53F8 company=\u516C\u53F8 owner_group=\u5F52\u5C5E\u90E8\u95E8 -group=\u90E8\u95E8 +group=Group template=Template Download export=Export import=Import @@ -561,11 +561,11 @@ av_voip_control=VoIP av_voip_ip_control=VoIP IP av_voip_account_control=VoIP Account av_sample_audio_control=Audio Sample -av_sample_vedio_control=Vedio Sample +av_sample_video_control=Video Sample av_sample_picture_control=Picture Sample av_sample_voip_control=VoIP Sample av_sample_audio_porn_control=Audio Porn Sign Sample -av_sample_vedio_porn_control=Vedio Porn Sign Sample +av_sample_video_porn_control=Video Porn Sign Sample av_sample_control=Sample configure_statistics_info=Configure statistics info harm_level=Degree of harm @@ -771,7 +771,6 @@ all_types=All Type group_type=Group Type group_name=Group Name default_group=Default Group -group=Group policy_group_manage=Policy Group Management #===========policy_group_manage end ============= #=============about manipulation========= @@ -826,11 +825,11 @@ 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_video=Video 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 +av_sample_video_porn=Video Porn Sgin Sample WHITE_LIST_IP=IP White List av_voip_ip=voip ip Configuration NTC_HTTP_URL=URL Configuration @@ -898,7 +897,6 @@ redirect_response_code=Redirect Response Code redirect_url=Redirect URL replace_zone=Replace Zone replaced_content=Replaced Content -replace_content=Replace Content http_req_uri=HTTP Request URI http_req_header=HTTP Request Header http_req_body=HTTP Request Content diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 1d4279c68..8828fc4b4 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -541,11 +541,11 @@ 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_video_control=video 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_video_porn_control=video porn sample control av_sample_control=sample control configure_statistics_info=Configure statistics info harm_level=harm level @@ -683,7 +683,7 @@ ip_intercept=ip intercept domain_intercept=domain intercept control_policy=control policy domain_forward=domain forward -http_redirect=http redirect +http_redirect=HTTP redirect http_req_replace=http request replace http_res_replace=http response replace replace_content=replace content @@ -698,8 +698,8 @@ policy_group_manage=strateagy grouping management ip_multiplex_policy=ip multiplex policy target_ip_protect=target ip protect ratelimit_config=ratelimit config -ip_ratelimit=ip ratelimit -domain_ratelimit=domain ratelimit +ip_ratelimit=IP speed limit +domain_ratelimit=Domain speed limit ratelimit=ratelimit scale ir_type=multiplex type dns_strategy_id=dns strategy id @@ -834,10 +834,7 @@ app_http_feature_monit=APP HTTP feature monitoring app_domain_feature_monit=APP domain feature monitoring app_byte_feature_monit=APP byte feature monitoring proxy_domain_forward=Domain forward -ip_ratelimit=IP speed limit -domain_ratelimit=Domain speed limit ip_complex_loop=IP complex -http_redirect=HTTP redirect ddos_ip_drop=DDOS IP ip_reuse_adress_pool_loop=IP reuse address pool app_strategy_monit=APP strategy monitoring diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 625dac5ae..d964b03fd 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -397,7 +397,7 @@ login=\u767B\u5F55 owner_company=\u5F52\u5C5E\u516C\u53F8 company=\u516C\u53F8 owner_group=\u5F52\u5C5E\u90E8\u95E8 -group=\u90E8\u95E8 +group=\u6240\u5C5E\u7EC4 template=\u4E0B\u8F7D\u6A21\u677F export=\u5BFC\u51FA import=\u5BFC\u5165 @@ -561,11 +561,11 @@ av_voip_control=\u97F3\u89C6\u9891VoIP av_voip_ip_control=VoIP IP av_voip_account_control=VoIP\u8D26\u53F7 av_sample_audio_control=\u97F3\u9891\u6837\u4F8B -av_sample_vedio_control=\u89C6\u9891\u6837\u4F8B +av_sample_video_control=\u89C6\u9891\u6837\u4F8B av_sample_picture_control=\u56FE\u7247\u6837\u4F8B av_sample_voip_control=VoIP\u6837\u4F8B av_sample_audio_porn_control=\u97F3\u9891\u573A\u666F\u6837\u4F8B -av_sample_vedio_porn_control=\u89C6\u9891\u573A\u666F\u6837\u4F8B +av_sample_video_porn_control=\u89C6\u9891\u573A\u666F\u6837\u4F8B av_sample_control=\u97F3\u89C6\u9891\u6837\u4F8B configure_statistics_info=\u914D\u7F6E\u7EDF\u8BA1\u4FE1\u606F harm_level=\u5371\u5BB3\u7A0B\u5EA6 @@ -773,7 +773,6 @@ all_types=\u6240\u6709\u7C7B\u578B group_type=\u5206\u7EC4\u7C7B\u578B group_name=\u5206\u7EC4\u540D\u79F0 default_group=\u7F3A\u7701\u7EC4 -group=\u6240\u5C5E\u7EC4 policy_group_manage=\u7B56\u7565\u5206\u7EC4\u7BA1\u7406 #===========policy_group_manage end ============= #=============about manipulation========= @@ -828,11 +827,11 @@ not_number=%s\u5FC5\u987B\u4E3A\u6570\u5B57 #=============some validation=========== #=============region_value,config form title================= av_sample_audio=\u97F3\u9891\u6837\u4F8B -av_sample_vedio=\u89C6\u9891\u6837\u4F8B +av_sample_video=\u89C6\u9891\u6837\u4F8B av_sample_picture=\u56FE\u7247\u6837\u4F8B av_sample_voip=VoIP\u6837\u4F8B av_sample_audio_porn=\u97F3\u9891\u573A\u666F\u6837\u4F8B -av_sample_vedio_porn=\u89C6\u9891\u573A\u666F\u6837\u4F8B +av_sample_video_porn=\u89C6\u9891\u573A\u666F\u6837\u4F8B WHITE_LIST_IP=IP\u767D\u540D\u5355 av_voip_ip=VoIP IP\u914D\u7F6E NTC_HTTP_URL=URL\u914D\u7F6E @@ -900,7 +899,6 @@ redirect_response_code=\u91CD\u5B9A\u5411\u5E94\u7B54\u7801 redirect_url=\u91CD\u5B9A\u5411URL replace_zone=\u66FF\u6362\u533A\u57DF replaced_content=\u88AB\u66FF\u6362\u5185\u5BB9 -replace_content=\u66FF\u6362\u5185\u5BB9 http_req_uri=HTTP\u8BF7\u6C42URI http_req_header=HTTP\u8BF7\u6C42\u5934 http_req_body=HTTP\u8BF7\u6C42\u5185\u5BB9 @@ -1040,4 +1038,4 @@ traffic_website_list=\u7F51\u7AD9\u6D41\u91CF\u7EDF\u8BA1\u5217\u8868 traffic_website_type_chart=\u7F51\u7AD9\u5206\u7C7B\u6D41\u91CF\u7EDF\u8BA1\u56FE website=\u7F51\u7AD9\u540D\u79F0 #===============dashboard end=================================== -ratelimit_limit=\u9650\u901F\u6BD4\u4F8B\u5FC5\u987B\u4ECB\u4E8E0\u5230100 \ No newline at end of file +ratelimit_limit=\u9650\u901F\u6BD4\u4F8B\u5FC5\u987B\u4ECB\u4E8E0\u5230100#===============dashboard end=================================== \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 42fa00f47..f7a663246 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -378,32 +378,32 @@ digest_single_file_max_size=10485760 #12M12582912 digest_total_file_max_size=12582912 #YSP文件保存路径 -av_file_path=/home/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_video_region=av_sample_video av_sample_picture_region=av_sample_picture av_sample_voip_region=av_sample_voip #样例文件生成程序 -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 +#audio_sample_create_proc=java -jar /home/sampleTest.jar +#video_sample_create_proc=java -jar /home/sampleTest.jar +#picture_sample_create_proc=java -jar /home/sampleTest.jar +#audio_sample_proc_param_is_quotation=true +#video_sample_proc_param_is_quotation=true +#picture_sample_proc_param_is_quotation=true +#audio_sample_proc_param_is_translation=false +#video_sample_proc_param_is_translation=false +#picture_sample_proc_param_is_translation=false +audio_sample_create_proc=java -jar D:\\sampleTest.jar +video_sample_create_proc=java -jar D:\\sampleTest.jar +picture_sample_create_proc=java -jar D:\\sampleTest.jar +audio_sample_proc_param_is_quotation=false +video_sample_proc_param_is_quotation=false +picture_sample_proc_param_is_quotation=false +audio_sample_proc_param_is_translation=true +video_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=HTTP_HEADER_DISTRICT @@ -416,8 +416,7 @@ specific_service_cfg_type_basic_protocol=basic_protocol #基础协议自定义域 proto_id_region=PROTO_ID #IP默认值 -ipv4_default_ip_value=0.0.0.0 -ipv4_default_ip_value=:: +ipv4_default_ip_value=\:\: ipv4_default_ip_subnet_value=0.0.0.0/32 ipv6_default_ip_subnet_value=::/64 ipv4_default_ip_range_value=0.0.0.0-0.0.0.0 diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index 40162da32..ac370f202 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -38,7 +38,7 @@ $(document).ready(function(){

- +

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 28f2f706a..536c62b7e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -38,7 +38,7 @@ $(document).ready(function(){

- +

diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index fad1c94bb..aaa2ee0bf 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/src/main/webapp/WEB-INF/views/login.jsp @@ -46,7 +46,7 @@ diff --git a/src/main/webapp/static/pages/img/login-02.png b/src/main/webapp/static/pages/img/login-02.png new file mode 100644 index 000000000..f31ce172c Binary files /dev/null and b/src/main/webapp/static/pages/img/login-02.png differ