diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java
index 417218233..fa72a5abe 100644
--- a/src/main/java/com/nis/domain/log/BaseLogEntity.java
+++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java
@@ -22,6 +22,8 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	protected Integer streamDir; //流类型  0：c2s；1：s2c；2：double，从字典LOG_STREAMTYPE取值
 	protected String capIp; //处理机IP
 	protected String addrList; //嵌套地址列表
+	protected String serverLocate;// 服务端地址定位信息
+	protected String clientLocate;// 客户端地址定位信息
 	protected String userRegion; //用户自定义
 	
 	protected Integer functionId;
@@ -164,16 +166,27 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	public void setSearchFoundEndTime(String searchFoundEndTime) {
 		this.searchFoundEndTime = searchFoundEndTime;
 	}
+	public String getServerLocate() {
+		return serverLocate;
+	}
+	public void setServerLocate(String serverLocate) {
+		this.serverLocate = serverLocate;
+	}
+	public String getClientLocate() {
+		return clientLocate;
+	}
+	public void setClientLocate(String clientLocate) {
+		this.clientLocate = clientLocate;
+	}
 	@Override
 	public String toString() {
-		return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", TransProto="
+		return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", transProto="
 				+ transProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort
 				+ ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId
 				+ ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList="
-				+ addrList + ", userRegion=" + userRegion + ", functionId=" + functionId + ", action=" + action
-				+ ", seltype=" + seltype + ", searchFoundStartTime=" + searchFoundStartTime + ", searchFoundEndTime="
-				+ searchFoundEndTime + "]";
+				+ addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + ", userRegion="
+				+ userRegion + ", functionId=" + functionId + ", action=" + action + ", seltype=" + seltype
+				+ ", searchFoundStartTime=" + searchFoundStartTime + ", searchFoundEndTime=" + searchFoundEndTime + "]";
 	}
-	
-	
+		
 }
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index e24f7b144..a7d5faa4c 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -705,7 +705,7 @@ qname=Query Content
 cname=cname
 dns_query=Request
 dns_response=Response
-entrance=entrance
+entrance=Entrance
 #dns_sub=DNS_SUB
 mail_proto=Mail Protocol 
 mail_from=Sender