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
	关键字日志转http url配置功能完成

src/main/java/com/nis/domain/configuration/BaseStringCfg.java

@@ -82,6 +82,9 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	private NtcSubscribeIdCfg ntcSubscribeIdCfg;
 	private IpPortCfg ipPort;
 	
+	//http url来源于http关键字的标识
+	private Integer sourceCompileId;
+	
 	
 	public IpPortCfg getIpPort() {
 		return ipPort;
@@ -190,7 +193,12 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
 		this.isCaseInsenstive =isCaseInsenstive;
 	}
-	
+	public Integer getSourceCompileId() {
+		return sourceCompileId;
+	}
+	public void setSourceCompileId(Integer sourceCompileId) {
+		this.sourceCompileId = sourceCompileId;
+	}
 	public static List<BaseStringCfg> replaceBaseKeyList(List<BaseStringCfg> list){
 		for (int i = 0; i < list.size(); i++) {
 			BaseStringCfg  base=(BaseStringCfg)list.get(i);