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/resources/messages/message_zh_CN.properties
This commit is contained in:
duandongmei
2018-08-10 16:33:03 +08:00
parent 96fa1eedb9 1badce36cb
commit 73cc8c90af
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -773,6 +773,7 @@ domain_intercept=\u57DF\u540D\u62E6\u622A
control_policy=\u63A7\u5236\u7B56\u7565
domain_forward=\u57DF\u540D\u8F6C\u53D1
http_redirect=HTTP(S) \u91CD\u5B9A\u5411\u914D\u7F6E
http_redirect=HTTP(S)\u91CD\u5B9A\u5411\u914D\u7F6E
http_req_replace=HTTP\u8BF7\u6C42\u5185\u5BB9\u66FF\u6362
http_res_replace=HTTP\u5E94\u7B54\u5185\u5BB9\u66FF\u6362
replace_content=\u66FF\u6362\u5185\u5BB9
@@ -899,6 +900,11 @@ http_reddirect=HTTP(S) \u91CD\u5B9A\u5411
http_replace=HTTP(S) \u66FF\u6362
http_monit=HTTP(S) \u76D1\u6D4B
http_whitelist=HTTP(S) \u767D\u540D\u5355
http_block=HTTP(S)\u7BA1\u63A7
http_reddirect=HTTP(S)\u91CD\u5B9A\u5411
http_replace=HTTP(S)\u66FF\u6362
http_monit=HTTP(S)\u76D1\u6D4B
http_whitelist=HTTP(S)\u767D\u540D\u5355
response_code=\u5E94\u7B54\u7801
response_content=\u54CD\u5E94\u5185\u5BB9
not_found=\u672A\u627E\u5230\u8BF7\u6C42\u754C\u9762
@@ -1017,6 +1023,11 @@ ctrl_http_redirect=HTTP(S) \u91CD\u5B9A\u5411
ctrl_http_replace=HTTP(S) \u66FF\u6362
ctrl_http_monit=HTTP(S) \u76D1\u6D4B
ctrl_http_whitelist=HTTP(S) \u767D\u540D\u5355
ctrl_http_reject=HTTP(S)\u7BA1\u63A7
ctrl_http_redirect=HTTP(S)\u91CD\u5B9A\u5411
ctrl_http_replace=HTTP(S)\u66FF\u6362
ctrl_http_monit=HTTP(S)\u76D1\u6D4B
ctrl_http_whitelist=HTTP(S)\u767D\u540D\u5355
#=============function_service_dict==>service_name=================
#=============about report===================
report_list=\u62A5\u8868