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

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
	
	修改是否十六进制选项选中值

src/main/resources/messages/message_en.properties

@@ -1120,5 +1120,6 @@ certificate_subject=Certificate Subject
 not_Before_Time=Certificate Start Time
 not_After_Time=Certificate End Time
 certificate_validity=Certificate Validity Period
+end_entity=End-entity Certificate
 header=Header
 layer=Layer

src/main/resources/messages/message_zh_CN.properties

@@ -1118,3 +1118,5 @@ certificate_subject=\u8BC1\u4E66\u62E5\u6709\u8005
 not_before_time=\u8BC1\u4E66\u8D77\u59CB\u65F6\u95F4
 not_after_time=\u8BC1\u4E66\u7EC8\u6B62\u65F6\u95F4
 certificate_validity=\u8BC1\u4E66\u6709\u6548\u671F
+header=\u5173\u952E\u5B57
+layer=\u5339\u914D\u533A\u57DF

src/main/resources/nis.properties

@@ -332,7 +332,7 @@ ssl_ca_region=ssl_ca
 ssl_ip_region=ssl_ip
 bgp_ip_region=bgp_ip
 behav_id_region=BEHAV_ID
-rate_limit_region=RATE_LIMIT
+rate_limit_region=Droprate
 #\u5b58\u5728\u4e0e\u8868\u8fbe\u5f0f\u7684\u5173\u952e\u5b57\u7279\u6b8a\u5206\u9694\u7b26
 keyword_expr=***and***
 #\u65f6\u533a
@@ -343,7 +343,7 @@ service_ip_mulitiplex=768
 service_ip_ratelimit=1057
 service_domain_ratelimit=1058
 #\u7528\u6237\u81ea\u5b9a\u4e49\u57df
-userregion_rate_limit=RATE_LIMIT
+userregion_rate_limit=Droprate
 userregion_ir_strategy=IR_STRATEGY
 userregion_ir_type=IR_TYPE
 userregion_domain_id=DOMAIN_ID