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://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/java/com/nis/web/controller/BaseController.java
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
This commit is contained in:
duandongmei
2018-08-21 13:31:21 +08:00
parent b1a2eae606 d52178a510
commit d6a2b98ec9
26 changed files with 1370 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1082,7 +1082,7 @@ PXY_INTERCEPT_PKT_BIN=Intercept Messages
certificate=Certificate
app_ssl_config=APP SSL Cert Feature
call_external_procedures_failed=Call external procedures failedfile_strategy=\u6587\u4EF6\u7B56\u7565
call_external_procedures_failed=Call external procedures failed
file_strategy=File Strategy
file_desc=File Desc
content_type=Content Type

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

@@ -1024,6 +1024,7 @@ MM_AV_URL=\u0410\u0443\u0434\u0438\u043E \u0438 \u0432\u0435\u0434\u0438\u043E U
MM_VOIP_IP=VoIP IP
MM_VOIP_ACCOUNT=\u0421\u0447\u0435\u0442 VoIP
#=======================for import ip configuration=================
<<<<<<< HEAD
drop_ip=\u041E\u0442\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u043D\u0438\u0435IP
loop_ip=\u0420\u0435\u0444\u043B\u044E\u043A\u0441 IP
drop_or_loop_ip=\u041E\u0442\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u043D\u0438\u0435/\u0420\u0435\u0444\u043B\u044E\u043A\u0441 IP
@@ -1038,4 +1039,15 @@ app_desc=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u0441\u043E\u0446\u0
tunnel_code=\u0421\u0435\u0440\u0438\u0439\u043D\u044B\u0439 \u043D\u043E\u043C\u0435\u0440 \u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F
tunnel_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F
tunnel_desc= \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F
call_external_procedures_failed=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u044B\u0437\u043E\u0432\u0430 \u0432\u043D\u0435\u0448\u043D\u0435\u0439 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B
call_external_procedures_failed=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u044B\u0437\u043E\u0432\u0430 \u0432\u043D\u0435\u0448\u043D\u0435\u0439 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B
=======
drop_ip=IP Drop
loop_ip=IP Loop
drop_or_loop_ip=IP Drop Or Loop
reject_or_monit_ip=IP Reject Or Monit
file_desc=File Desc
content_type=Content Type
content_length=Content Length
response_file=Response File
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git