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

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -391,5 +391,13 @@
     <function-signature>java.lang.String getHttpBodyKeyword(java.lang.Integer)</function-signature>
     <example>${fns:getHttpBodyKeyword(compileId)}</example>
   </function>
+  <!-- 根据id获取配置关键字 -->
+    <function>
+    <description>根据compileId获取crl</description>
+    <name>getTrustedCrlByCerId</name>
+    <function-class>com.nis.util.ConfigDictUtils</function-class>
+    <function-signature>java.util.List getTrustedCrlByCerId(java.lang.Integer)</function-signature>
+    <example>${fns:getTrustedCrlByCerId(cerId)}</example>
+  </function>
   
 </taglib>