恢复之前的定时任务配置取消不走综合服务的问题;

去掉英文国际化的合并记录

Conflicts:
	src/main/resources/messages/message_en.properties
This commit is contained in:
duandongmei
2019-05-05 11:02:11 +08:00
committed by 段冬梅
parent 1eaa2e668b
commit 00ffdd863c
4 changed files with 14 additions and 5 deletions

View File

@@ -1515,6 +1515,15 @@ src_ip_pattern=Client IP Pattern
dest_ip_pattern=Server IP Pattern
src_port_pattern=Client Port Pattern
dest_port_pattern=Server Port Pattern
url_group_configuration=URL Group Configuration
dns_keyword_group_configuration=DNS Keyword Group Configuration
app_ip_correlation=APP IP Correlation
ip_group=IP Group
common_ip_config=Common IP Config
common_group=Common Group
dns_keyword_group_manage=DNS Keyword Group Manage
old_asn_group_manage=ASN Group
url_group_manage=URL Group Manage
range_cross=Found intersections between Server IP address and Client IP address
app_ip_correlation=APP IP Correlation
public_private_file_error=Public-private key mismatch
public_private_file_error=Public-private key mismatch