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
This commit is contained in:
zhanghongqing
2018-08-20 17:47:01 +08:00
parent ada7d38be9 2c3c545059
commit faf13409c3
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/main/java/com/nis/web/controller/log/ntc/B2pLogController.java → src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java
View File

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

@@ -1077,5 +1077,7 @@ domain_intercepter_replace=Domain Intercept Replace
ip_intercepter_ratelimit=IP Intercept Ratelimit
domain_intercepter_ratelimit=Domain Intercept Ratelimit
app_built_in_features_config=APP Built-in Features
app_ssl_config=APP SSL Cert Feature
PXY_INTERCEPT_PKT_BIN=Intercept Messages
certificate=Certificate
app_ssl_config=APP SSL Cert Feature
p2p_control=P2P

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

@@ -1076,4 +1076,5 @@ ip_intercepter_ratelimit=IP\u62E6\u622A\u9650\u901F
domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F
app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
p2p_control=P2P
PXY_INTERCEPT_PKT_BIN=\u62E6\u622A\u62A5\u6587
certificate=\u8BC1\u4E66