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/CfgIndexInfo.java

@@ -71,6 +71,14 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private List<P2pHashCfg> p2pHashList;
 	private List<P2pKeywordCfg> p2pKeywordList;
 	
+	private Integer sourceCompileId;
+	public Integer getSourceCompileId() {
+		return sourceCompileId;
+	}
+	public void setSourceCompileId(Integer sourceCompileId) {
+		this.sourceCompileId = sourceCompileId;
+	}
+	
 	public AvContUrlCfg getAvContUrlCfg() {
 		return avContUrlCfg;
 	}