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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

Browse Source 
into develop

Conflicts:
	src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
This commit is contained in:
tanghao
2019-01-03 15:01:46 +08:00
parent 3fb9b5b159 2312b41035
commit 1e0fc76160
34 changed files with 1851 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1438,4 +1438,10 @@ print=Print
traffic_connect_log=Traffic Log
keyword_log_to_url=KeywordLogToURL
http_log=HTTP Logs
cut_sample_tool=Cut Sample Tool
cut_sample_tool=Cut Sample Tool
hex_minlength_3=Please enter a hexadecimal string of length 3
hex_minlength_4=Please enter a hexadecimal string of length 4
hex_minlength_8=Please enter a hexadecimal string of length 8
hex_minlength_16=Please enter a hexadecimal string of length 16
need_input=Attributes need to be filled in
max_input=Fill in at most four

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

@@ -1442,4 +1442,10 @@ print=Print
traffic_connect_log=\u0416\u0443\u0440\u043D\u0430\u043B \u0422\u0440\u0430\u0444\u0438\u043A\u0430
keyword_log_to_url=KeywordLogToURL
http_log=HTTP Logs
cut_sample_tool=Cut Sample Tool
cut_sample_tool=Cut Sample Tool
hex_minlength_3=Please enter a hexadecimal string of length 3
hex_minlength_4=Please enter a hexadecimal string of length 4
hex_minlength_8=Please enter a hexadecimal string of length 8
hex_minlength_16=Please enter a hexadecimal string of length 16
need_input=Attributes need to be filled in
max_input=Fill in at most four

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

@@ -1438,4 +1438,10 @@ print=\u6253\u5370
traffic_connect_log=\u6D41\u91CF\u65E5\u5FD7
keyword_log_to_url=\u5173\u952E\u5B57\u65E5\u5FD7\u8F6CURL
http_log=HTTP \u65E5\u5FD7
cut_sample_tool=\u6837\u4F8B\u526A\u5207\u5DE5\u5177
cut_sample_tool=\u6837\u4F8B\u526A\u5207\u5DE5\u5177
hex_minlength_3=\u8BF7\u8F93\u5165\u957F\u5EA6\u4E3A3\u7684\u5341\u516D\u8FDB\u5236\u5B57\u7B26\u4E32
hex_minlength_4=\u8BF7\u8F93\u5165\u957F\u5EA6\u4E3A4\u7684\u5341\u516D\u8FDB\u5236\u5B57\u7B26\u4E32
hex_minlength_8=\u8BF7\u8F93\u5165\u957F\u5EA6\u4E3A8\u7684\u5341\u516D\u8FDB\u5236\u5B57\u7B26\u4E32
hex_minlength_16=\u8BF7\u8F93\u5165\u957F\u5EA6\u4E3A16\u7684\u5341\u516D\u8FDB\u5236\u5B57\u7B26\u4E32
need_input=\u9700\u8981\u586B\u5199\u5C5E\u6027
max_input=\u6700\u591A\u586B\u5199\u56DB\u4E2A

6
src/main/resources/sql/20190102/update_function_dicts.sql Normal file
View File

@@ -0,0 +1,6 @@
-- APP Payload --
UPDATE function_region_dict SET is_import = 1 WHERE function_id = 563 AND dict_id = 211;
UPDATE function_region_dict SET is_import = 1 WHERE function_id = 563 AND dict_id = 212;
UPDATE function_service_dict SET is_import = 1 WHERE function_id = 563;