gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	关键字日志转http url配置功能完成
This commit is contained in:
duandongmei
2018-10-29 16:29:23 +08:00
parent 65ba7f2d7a 27575259a8
commit a30d80e64e
98 changed files with 2202 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/webapp/WEB-INF/tlds/fns.tld
View File

@@ -211,6 +211,20 @@
<function-signature>java.util.List getDictList(java.lang.String)</function-signature>
<example>${fns:getDictList(key)}</example>
</function>
<function>
<description>获取functionId下的service列表</description>
<name>getFunctionServiceDictList</name>
<function-class>com.nis.util.DictUtils</function-class>
<function-signature>java.util.List getFunctionServiceDictList(java.lang.Integer)</function-signature>
<example>${fns:getFunctionServiceDictList(key)}</example>
</function>
<function>
<description>获取functionId下的region列表</description>
<name>getFunctionRegionDictList</name>
<function-class>com.nis.util.DictUtils</function-class>
<function-signature>java.util.List getFunctionRegionDictList(java.lang.Integer)</function-signature>
<example>${fns:getFunctionRegionDictList(key)}</example>
</function>
<function>
<description>获取字典Map列表</description>
@@ -369,5 +383,13 @@
<function-signature>java.util.List getCodeList(java.lang.String)</function-signature>
<example>${fns:getCodeList(str)}</example>
</function>
<!-- 根据id获取配置关键字 -->
<function>
<description>根据compileId获取关键字</description>
<name>getHttpBodyKeyword</name>
<function-class>com.nis.util.ConfigDictUtils</function-class>
<function-signature>java.lang.String getHttpBodyKeyword(java.lang.Integer)</function-signature>
<example>${fns:getHttpBodyKeyword(compileId)}</example>
</function>
</taglib>