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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties

voip 和流媒体域与服务端表名更改
国际化文件增加voip和流媒体域描述
This commit is contained in:
duandongmei
2018-10-11 19:40:01 +08:00
parent e25be9a7a2 ef6d793d6b
commit c5130454f1
10 changed files with 211 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1215,4 +1215,4 @@ protocol_identify=Protocol Identify
MM_FILE_DIGEST=File Digest Configuration
NTC_ASN_IP=ASN
NTC_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP Account
NTC_VOIP_ACCOUNT=VoIP Account

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

@@ -1216,4 +1216,4 @@ protocol_identify=Protocol Identify
NTC_ASN_IP=ASN
MM_FILE_DIGEST=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u0424\u0430\u0439\u043B\u043E\u0432
NTC_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442
NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1209,4 +1209,4 @@ protocol_identify=Protocol Identify
MM_FILE_DIGEST=\u6587\u4EF6\u6458\u8981\u914D\u7F6E
NTC_ASN_IP=ASN
NTC_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP Account
NTC_VOIP_ACCOUNT=VoIP Account

3
src/main/resources/sql/20181010/update_media_region.sql
View File

@@ -3,12 +3,15 @@ update function_service_dict set service_id='39',protocol_id='23' where dict_id=
update function_service_dict set service_id='151',protocol_id='23' where dict_id='31';
#流媒体协议 增加IP配置
INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`) VALUES ('22', '', '1', 'NTC_UNIVERSAL_IP', '流媒体协议 IP配置', '1', '1', '1', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', '', '', '4,6', '', '', '1,2,3', '1,2', '0,1', '0,6,17', '1,2,3,4', '1');
update function_region_dict set config_region_value='NTC_STREAMING_MEDIA_URL' where dict_id='25';
#voip配置
update function_service_dict set service_id='38',protocol_id='22' where dict_id='16';
update function_service_dict set service_id='150',protocol_id='22' where dict_id='17';
#voip 配置
update function_region_dict set config_region_value='NTC_UNIVERSAL_IP' where dict_id='8';
update function_region_dict set config_region_value='NTC_VOIP_ACCOUNT' where dict_id='16';
update function_region_dict set is_valid=0 where dict_id='208';
#文件摘要配置
update function_service_dict set service_id='399' where dict_id='59';

2
src/main/resources/sql/20181011/extend_region_type.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE function_region_dict MODIFY COLUMN region_type INT(1) NOT NULL COMMENT '1IP类，2字符串类，3增强字符串类，4数值类，5摘要类，6回调类,7 ASN';
UPDATE function_region_dict SET region_type=7 WHERE config_region_value='NTC_ASN_IP' AND function_id=5;