证书校验国际化增加

src/main/java/com/nis/util/Constants.java

@@ -643,6 +643,8 @@ public final class Constants {
 	public static final boolean SPEAKER_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("speaker_sample_proc_param_is_translation", false);
 	public static final boolean LOGO_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("logo_sample_proc_param_is_translation", false);
 	public static final boolean FACE_SAMPLE_PROC_PARAM_IS_TRANSLATION = Configurations.getBooleanProperty("face_sample_proc_param_is_translation", false);
+	//视频文件生成关键帧图片相关参数
+	public static final String VEDIO_TO_PICTURE_PROC = Configurations.getStringProperty("video_to_picture_proc", "./video_to_picture_proc");
 	
 	//HTTP自定义域相关参数
 	public static String HTTP_HEADER_USER_REGION_KEY=Configurations.getStringProperty("http_header_user_region_key", "HTTP_HEADER");
@@ -689,4 +691,10 @@ public final class Constants {
 	
 	//音视频样例时长限制，单位秒
 	public static final int AV_DURATION_LIMIT=Configurations.getIntProperty("av_duration_limit", 120);
+	//证书文件存放路径
+	public static final String CERT_FILE_PATH=Configurations.getStringProperty("cert_file_path", "");
+	//证书校验文件
+	public static final String CERT_VALIDATE_FILE=Configurations.getStringProperty("cert_validate_file", "x509");
+	//证书校验成功关键字
+	public static final String CERT_VALIDATE_SUCCESS_INFO=Configurations.getStringProperty("cert_validate_success_info", "x509");
 }

src/main/resources/messages/message_en.properties

@@ -1263,4 +1263,8 @@ the_same_port_pattern=Client port and server port must in the same port pattern
 ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
 ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
 ip_range_smaller=Start IP in a IP range should smaller than end IP
-alternative_values= Alternative values can be %s
+alternative_values= Alternative values can be %s
+certificate_error=Wrong format of public key file and private key file
+public_file_error=Wrong format of public key file
+private_file_error=Wrong format of private key file
+keyframe_pic_required=No keyframe pictures have been selected.

src/main/resources/messages/message_ru.properties

@@ -1283,4 +1283,8 @@ the_same_port_pattern=Client port and server port must in the same port pattern
 ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
 ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
 ip_range_smaller=Start IP in a IP range should smaller than end IP
-alternative_values= Alternative values can be %s
+alternative_values= Alternative values can be %s
+certificate_error=Wrong format of public key file and private key file
+public_file_error=Wrong format of public key file
+private_file_error=Wrong format of private key file
+keyframe_pic_required=No keyframe pictures have been selected.

src/main/resources/messages/message_zh_CN.properties

@@ -1257,4 +1257,9 @@ the_same_port_pattern=\u6E90\u7AEF\u53E3\u4E0E\u76EE\u7684\u7AEF\u53E3\u7AEF\u53
 ip_range_in_c=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u5FC5\u987B\u5728C\u7F51\u6BB5
 ip_range_bit_field=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u7F51\u7EDC\u5730\u5740\u5FC5\u987B\u76F8\u540C
 ip_range_smaller=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u5FC5\u987B\u5C0F\u4E8E\u7EC8\u6B62IP
-alternative_values=\u53EF\u9009\u62E9\u7684\u503C\u6709%s
+alternative_values=\u53EF\u9009\u62E9\u7684\u503C\u6709%s
+certificate_error=\u516C\u94A5\u3001\u79C1\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
+public_file_error=\u516C\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
+keyframe_pic_required=\u5C1A\u672A\u9009\u62E9\u5173\u952E\u5E27\u56FE\u7247
+private_file_error=\u79C1\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
+keyframe_pic_required=\u5C1A\u672A\u9009\u62E9\u5173\u952E\u5E27\u56FE\u7247

src/main/resources/nis.properties

@@ -530,4 +530,11 @@ isp_tag=isp
 mmFileDigestLog=mmFileDigestLogs
 ntcStreamMediaLog=ntcStreamMediaLogs
 #音视频样例限制时长，单位秒
-av_duration_limit=120
+av_duration_limit=120
+video_to_picture_proc=/root/code/shot_detect/shot_detect
+#证书文件路径
+cert_file_path=/home/cert/
+#证书校验工具名称
+cert_validate_file=x509
+#证书校验成功的关键信息
+cert_validate_success_info=Successful

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -2,7 +2,6 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%> 
 <script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
 <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
-<<<<<<< HEAD
 	<form id="importForm1" action="${ctx}/ntc/iplist/import?importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal"
 		onsubmit="loading('<spring:message code='loading'/>');">
 		

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -471,7 +471,6 @@
 				</div>
 			</div>
 </div>
-<<<<<<< HEAD
 <c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/>
 <!-- 模板导入，start -->
 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>