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

Conflicts:
	src/main/resources/messages/message_en.properties
修改国际化文件；
修改dns和account的匹配方式为多种匹配方式
app和asn的监测配置都默认为记录全日志
样例的level修改时未展示正确的level值

src/main/resources/messages/message_zh_CN.properties

@@ -1069,8 +1069,8 @@ website=\u7F51\u7AD9\u57DF\u540D
 
 p2p_ip_config_type=IP\u914D\u7F6E\u7C7B\u578B
 p2p_hash_type=HASH\u7C7B\u578B
-NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
-WHITE_LIST_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
+NTC_SUBSCRIBE_ID=\u8D26\u53F7
+WHITE_LIST_SUBSCRIBE_ID=\u8D26\u53F7
 
 app_header_config=APP\u5C42\u5934\u7279\u5F81
 app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
@@ -1090,7 +1090,7 @@ file_desc=\u6587\u4EF6\u63CF\u8FF0
 content_type=\u5185\u5BB9\u7C7B\u578B
 content_length=\u6587\u4EF6\u957F\u5EA6
 response_file=\u54CD\u5E94\u6587\u4EF6
-APP_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
+APP_SUBSCRIBE_ID=\u8D26\u53F7
 reply_file=\u54CD\u5E94\u6587\u4EF6
 app_topic_domain_cfg=\u4E3B\u9898\u7F51\u7AD9
 #=====================about app Tcp=================================

src/main/resources/sql/20180914/update_function_service_dict.sql

@@ -0,0 +1,3 @@
+#修改人脸识别阻断和监测的serviceId
+UPDATE `function_service_dict` SET `service_id`='268' , `action`='16'  WHERE `dict_id`='121';
+UPDATE `function_service_dict` SET `service_id`='396' , `action`='1'  WHERE `dict_id`='122';

src/main/resources/sql/20180917/update_region_dict.sql

@@ -0,0 +1,2 @@
+#update account and DNS match_method=0,1,2,3
+update function_region_dict set config_match_method='0,1,2,3' where dict_id in (16,28);