Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
duandongmei
2018-07-24 15:17:18 +08:00
44 changed files with 1239 additions and 179 deletions

View File

@@ -790,6 +790,10 @@ app_byte_config=APP Byte Feature
social_app=Applicaiton
app_policy_config=APP Policy
app_features_config=APP Feature
cfg_type=Cfg Type
encrypted_tunnel_behavior=Encrypted Tunnel Behavior
behaviour_type=Behaviour Type
basic_protocol=Basic Protocol
#=============about app config===========
#=============about Maintenance=========
ip_Reuse_pool_config=IP Reuseing Pool

View File

@@ -702,6 +702,21 @@ ratelimit=ratelimit scale
ir_type=multiplex type
dns_strategy_id=dns strategy id
#=============about manipulation=========
#=============about app config===========
domain=Domain
app_ip_config=APP Protocol IP
bytes=byte
app_http_config=APP HTTP Feature
app_domain_config=APP Domain Feature
app_byte_config=APP Byte Feature
social_app=Applicaiton
app_policy_config=APP Policy
app_features_config=APP Feature
cfg_type=Cfg Type
encrypted_tunnel_behavior=Encrypted Tunnel Behavior
behaviour_type=Behaviour Type
basic_protocol=Basic Protocol
#=============about app config===========
#=============about Maintenance=========
ip_multiplex_pool_config=ip multiplex pool config
dns_res_strategy=dns response strategy

View File

@@ -792,6 +792,10 @@ app_byte_config=APP\u5B57\u8282\u7279\u5F81
social_app=\u793E\u4EA4\u5E94\u7528
app_policy_config=APP\u7B56\u7565
app_features_config=APP\u7279\u5F81
cfg_type=\u914D\u7F6E\u7C7B\u578B
encrypted_tunnel_behavior=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A
behaviour_type=\u884C\u4E3A\u7C7B\u578B
basic_protocol=\u57FA\u7840\u534F\u8BAE
#=============about app config===========
#=============about Maintenance=========
ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60