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

This commit is contained in:
duandongmei
2018-08-06 09:04:48 +08:00
40 changed files with 321 additions and 233 deletions

View File

@@ -730,7 +730,7 @@ attack_type=\u653B\u51FB\u7C7B\u578B
attack_start_time=\u653B\u51FB\u8D77\u59CB\u65F6\u95F4
last_attack_time=\u6700\u540E\u4E00\u6B21\u653B\u51FB\u5305\u65F6\u95F4
attack_max_pps=\u653B\u51FB\u6700\u5927\u6D41\u91CF \u5305\u6570/\u79D2
attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF bit\u6570/\u79D2
attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF Bit\u6570/\u79D2
attack_total_pkt=\u653B\u51FB\u7D2F\u79EF\u5305\u6570
attack_total_byte=\u653B\u51FB\u7D2F\u79EF\u5B57\u8282\u6570
is_blcok=\u653B\u51FB\u6D41\u91CF\u662F\u5426\u88AB\u4E22\u5F03
@@ -741,18 +741,18 @@ c2s_pkt_num=c2s\u5305\u6570
s2c_pkt_num=s2c\u5305\u6570
c2s_byte_num=c2s\u5B57\u8282\u6570
s2c_byte_num=s2c\u5B57\u8282\u6570
voip_recv_time=VOIP\u63A5\u6536\u65F6\u95F4
voip_protocol=VOIP\u4F20\u8F93\u534F\u8BAE
voip_recv_time=VoIP\u63A5\u6536\u65F6\u95F4
voip_protocol=VoIP\u4F20\u8F93\u534F\u8BAE
av_protocol=\u97F3\u89C6\u9891\u4F20\u8F93\u534F\u8BAE
duation=VOIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09
calling_account=\u4E3B\u53EBVOIP\u8D26\u53F7
called_account=\u88AB\u53EBVOIP\u8D26\u53F7
calling_number=VOIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801
called_number=VOIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801
from_to_store_ip=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
from_to_store_url=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
to_from_store_ip=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
to_from_store_url=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
duation=VoIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09
calling_account=\u4E3B\u53EBVoIP\u8D26\u53F7
called_account=\u88AB\u53EBVoIP\u8D26\u53F7
calling_number=VoIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801
called_number=VoIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801
from_to_store_ip=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
from_to_store_url=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
to_from_store_ip=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
to_from_store_url=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
pid=\u8282\u76EEID
log_uri=\u5C01\u5835\u73B0\u573A\u7247\u6BB5\u8DEF\u5F84
fd_type=\u5C01\u5835\u7C7B\u578B