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 develop

Browse Source
This commit is contained in:
DuanDongmei
2018-12-07 09:51:37 +08:00
parent d530ffdd10 7a99f6b758
commit 1c3dc455e3
30 changed files with 2008 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1339,4 +1339,13 @@ config_sync=Configuration Synchronization
info_failed=Information Acquisition Failure
address_pool_ip_configuration=Address Pool IP Configuration
cgi_failed=CGI Server
ip_check=Please enter a correct IP address
ip_check=Please enter a correct IP address
user_type=User Type
policy_vpn_user=VPN access user name
policy_sipv4_user=Three tier access to IP(IPv4)
policy_sipv6_user=Three tier access to IP(IPv6)
creat_time=Creat Time
close_time=Close Time
nat_ip=Multiplexed IP Address
traffic=Traffic
ip_info=IP Info

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

@@ -1337,4 +1337,13 @@ config_sync=\u914D\u7F6E\u540C\u6B65
info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
address_pool_ip_configuration=\u5730\u5740\u6C60 IP\u914D\u7F6E
cgi_failed=CGI\u670D\u52A1
ip_check=\u8BF7\u586B\u5199\u6B63\u786E\u7684IP\u5730\u5740
ip_check=\u8BF7\u586B\u5199\u6B63\u786E\u7684IP\u5730\u5740
user_type=\u7528\u6237\u7C7B\u578B
policy_vpn_user=VPN\u63A5\u5165\u7528\u6237\u540D
policy_sipv4_user=\u4E09\u5C42\u63A5\u5165\u6E90IP(IPv4)
policy_sipv6_user=\u4E09\u5C42\u63A5\u5165\u6E90IP(IPv6)
creat_time=\u94FE\u63A5\u5EFA\u7ACB\u65F6\u95F4
close_time=\u94FE\u63A5\u7ED3\u675F\u65F6\u95F4
nat_ip=\u590D\u7528\u7684IP\u5730\u5740
traffic=Traffic
ip_info=IP\u5730\u5740\u4FE1\u606F

8
src/main/resources/nis.properties
View File

@@ -570,4 +570,10 @@ ipNumGet=IpNumGet
allIpGet=AllIpGet
#\u6D41\u91CF\u7EDF\u8BA1\u5E26\u5BBD\u8BE6\u60C5
trafficBandwidthTrans=trafficBandwidthTrans
trafficProtocolList=trafficProtocolList
trafficProtocolList=trafficProtocolList
irSnatLog=irSnatLogs
irDnatLog=irDnatLogs
trafficBandwidthTrans=trafficBandwidthTrans
trafficProtocolList=trafficProtocolList
trafficAppList=trafficAppList
ntcActionEntranceReport=ntcActionEntranceReport

5
src/main/resources/sql/20181206/update_function_region_dict.sql Normal file
View File

@@ -0,0 +1,5 @@
UPDATE function_region_dict SET config_ip_pattern = '1,3' WHERE dict_id = 68 AND function_id = 300;
ALTER TABLE ip_reuse_policy_cfg ADD ip_type INT(11) DEFAULT NULL COMMENT 'IPV4=4,IPV6=6';
ALTER TABLE ip_reuse_policy_cfg ADD ip_pattern INT(11) DEFAULT NULL;
ALTER TABLE ip_reuse_policy_cfg ADD src_ip_address VARCHAR(128) DEFAULT NULL;