Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
	证书增加CN和SAN列，修改时间类型
	common.js去掉无用字符
	国际化增加cert_not_match_domain

src/main/resources/messages/message_en.properties

@@ -1321,4 +1321,11 @@ ethernet=Ethernet
 http_req_body_keywords=Request Body Keyword
 http_res_body_keywords=Response Body Keyword
 http_req_hdr_keywords=Request Header Keyword
-http_res_hdr_keywords=Response Header Keyword
+http_res_hdr_keywords=Response Header Keyword
+traffic_user_behavior=Traffic Account Behavior
+user_behavior_data=Account statistics
+ip_behavior_data=IP statistics
+p2p_eMule_keywords=eMule Search Keywords
+p2p_hash_keywords=File Marking Keywords
+not_valid_domain=%s is not a valid domain
+cert_not_match_domain=Domain and certificate information do not match!

src/main/resources/messages/message_zh_CN.properties

@@ -1313,4 +1313,9 @@ http_res_body_keywords=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57
 http_req_hdr_keywords=\u8BF7\u6C42\u5934\u57DF\u5173\u952E\u5B57
 http_res_hdr_keywords=\u5E94\u7B54\u5934\u57DF\u5173\u952E\u5B57
 p2p_eMule_keywords=eMule\u641C\u7D22\u5173\u952E\u5B57
-p2p_hash_keywords=\u6587\u4EF6\u6807\u8BC6\u5173\u952E\u5B57
+p2p_hash_keywords=\u6587\u4EF6\u6807\u8BC6\u5173\u952E\u5B57
+traffic_user_behavior=\u7528\u6237\u884C\u4E3A\u7EDF\u8BA1
+user_behavior_data=\u7528\u6237\u7EDF\u8BA1
+ip_behavior_data=\u7528\u6237IP\u7EDF\u8BA1
+not_valid_domain=%s\u4E0D\u662F\u4E00\u4E2A\u5408\u6CD5\u57DF\u540D
+cert_not_match_domain=\u57DF\u540D\u4E0E\u6240\u9009\u8BC1\u4E66\u4FE1\u606F\u4E0D\u7B26\u5408\uFF01

src/main/resources/nis.properties

@@ -286,6 +286,7 @@ trafficTopicAndDomainChart=trafficTopicAndDomainChart
 ntcTotalReport=ntcTotalReport
 trafficIpActiveFiveMinute=trafficIpActiveFiveMinute
 trafficIpActiveOneHour=trafficIpActiveOneHour
+ntcRadiusReport=ntcRadiusReport
 
 client_connect_timeout=300000
 client_read_timeout=300000
@@ -530,15 +531,17 @@ area_tag=location
 isp_tag=isp
 mmFileDigestLog=mmFileDigestLogs
 ntcStreamMediaLog=ntcStreamMediaLogs
-#音视频样例限制时长，单位秒
+#\u97f3\u89c6\u9891\u6837\u4f8b\u9650\u5236\u65f6\u957f\uff0c\u5355\u4f4d\u79d2
 av_duration_limit=120
 video_to_picture_proc=/root/code/shot_detect/shot_detect
-#证书文件路径
+#\u8bc1\u4e66\u6587\u4ef6\u8def\u5f84
 cert_file_path=/home/cert/
-#证书校验工具名称
+#\u8bc1\u4e66\u6821\u9a8c\u5de5\u5177\u540d\u79f0
 cert_validate_file=x509
-#证书校验成功的关键信息
+#\u8bc1\u4e66\u6821\u9a8c\u6210\u529f\u7684\u5173\u952e\u4fe1\u606f
 cert_validate_success_info=Successful
-#ipv4 range新格式0.0.0.1-2
+#ipv4 range\u65b0\u683c\u5f0f0.0.0.1-2
 ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
-ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$
+ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$
+#域名验证正则
+domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$

src/main/resources/sql/20181105/alert_pxy_obj_file.sql

@@ -0,0 +1,4 @@
+ALTER TABLE pxy_obj_keyring ADD  cn varchar(400) DEFAULT null COMMENT 'CN<EFBFBD><EFBFBD>Ϣ';
+ALTER TABLE pxy_obj_keyring ADD  alt_name varchar(4000) DEFAULT null COMMENT 'SAN<EFBFBD><EFBFBD>Ϣ';
+alter table pxy_obj_keyring modify column not_before_time varchar(40);
+alter table pxy_obj_keyring modify column not_after_time varchar(40);

src/main/resources/sql/20181105/change_asn_no_range.sql

@@ -0,0 +1,2 @@
+ALTER TABLE config_group_info MODIFY COLUMN asn_id BIGINT(20) NULL COMMENT 'asn 组对应的asn号';
+ALTER TABLE policy_group_info MODIFY COLUMN asn_no BIGINT(20) NULL COMMENT 'asn号';

src/main/resources/sql/20181105/update_region_dict.sql

@@ -0,0 +1,2 @@
+UPDATE function_region_dict SET config_ip_port_show = '1' WHERE function_id = 300 AND dict_id = 68;
+UPDATE function_region_dict SET config_ip_port_show = '3,4' WHERE function_id = 304 AND dict_id = 232;

src/main/resources/sql/20181105/update_region_service_dict.sql

@@ -0,0 +1,2 @@
+UPDATE function_region_dict SET is_import=1 WHERE function_id=403 AND is_valid=1;
+UPDATE function_service_dict SET is_import=1 WHERE function_id=403 AND is_valid=1;