diff --git a/src/main/java/com/nis/domain/LogEntity.java b/src/main/java/com/nis/domain/LogEntity.java
index 1b2c9a6..74a0a90 100644
--- a/src/main/java/com/nis/domain/LogEntity.java
+++ b/src/main/java/com/nis/domain/LogEntity.java
@@ -74,6 +74,10 @@ public abstract class LogEntity<T> implements Serializable {
 	protected String addrList;
 	@ApiModelProperty(value = "用户自定义域", required = true)
 	private String userRegion;
+	@ApiModelProperty(value = "服务端地址定位信息", required = true)
+	protected String serverLocate;
+	@ApiModelProperty(value = "客户端地址定位信息", required = true)
+	private String clientLocate;
 
 	protected String searchCfgId;//配置id
 	protected String searchTransProto;//协议类型
@@ -432,4 +436,20 @@ public abstract class LogEntity<T> implements Serializable {
 		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;
+	}
+
 }
diff --git a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java
index 5322c01..99d813d 100644
--- a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java
+++ b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java
@@ -15,7 +15,7 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
 public class DkBehaviorLog  extends LogEntity<DkBehaviorLog> {
 	private static final long serialVersionUID = -589390375816690510L;
 	@ApiModelProperty(value = "协议标签", required = true)
-    protected Integer appLabel;
+    protected String appLabel;
     @ApiModelProperty(value = "发送c2s包数", required = true)
     protected String c2sSendPktNum;
     @ApiModelProperty(value = "发送s2c包数", required = true)
@@ -25,17 +25,17 @@ public class DkBehaviorLog  extends LogEntity<DkBehaviorLog> {
     @ApiModelProperty(value = "发送s2c字节数", required = true)
     protected String s2cSendByteNum;
     @ApiModelProperty(value = "接收c2s包数", required = true)
-    protected String c2sRecvSendPktNum;
+    protected String c2sRecvPktNum;
     @ApiModelProperty(value = "接收s2c包数", required = true)
-    protected String s2cRecvSendPktNum;
+    protected String s2cRecvPktNum;
     @ApiModelProperty(value = "接收c2s字节数", required = true)
     protected String c2sRecvByteNum;
     @ApiModelProperty(value = "接收s2c字节数", required = true)
     protected String s2cRecvByteNum;
-	public Integer getAppLabel() {
+	public String getAppLabel() {
 		return appLabel;
 	}
-	public void setAppLabel(Integer appLabel) {
+	public void setAppLabel(String appLabel) {
 		this.appLabel = appLabel;
 	}
 	public String getC2sSendPktNum() {
@@ -62,17 +62,17 @@ public class DkBehaviorLog  extends LogEntity<DkBehaviorLog> {
 	public void setS2cSendByteNum(String s2cSendByteNum) {
 		this.s2cSendByteNum = s2cSendByteNum;
 	}
-	public String getC2sRecvSendPktNum() {
-		return c2sRecvSendPktNum;
+	public String getC2sRecvPktNum() {
+		return c2sRecvPktNum;
 	}
-	public void setC2sRecvSendPktNum(String c2sRecvSendPktNum) {
-		this.c2sRecvSendPktNum = c2sRecvSendPktNum;
+	public void setC2sRecvPktNum(String c2sRecvPktNum) {
+		this.c2sRecvPktNum = c2sRecvPktNum;
 	}
-	public String getS2cRecvSendPktNum() {
-		return s2cRecvSendPktNum;
+	public String getS2cRecvPktNum() {
+		return s2cRecvPktNum;
 	}
-	public void setS2cRecvSendPktNum(String s2cRecvSendPktNum) {
-		this.s2cRecvSendPktNum = s2cRecvSendPktNum;
+	public void setS2cRecvPktNum(String s2cRecvPktNum) {
+		this.s2cRecvPktNum = s2cRecvPktNum;
 	}
 	public String getC2sRecvByteNum() {
 		return c2sRecvByteNum;
diff --git a/src/main/java/com/nis/web/controller/restful/LogController.java b/src/main/java/com/nis/web/controller/restful/LogController.java
index 0476c17..75526c6 100644
--- a/src/main/java/com/nis/web/controller/restful/LogController.java
+++ b/src/main/java/com/nis/web/controller/restful/LogController.java
@@ -1233,11 +1233,11 @@ public class LogController extends BaseRestController {
 			auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause());
 			logger.error(e);
 			if (!(e instanceof RestServiceException)) {
-				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "VOIP日志检索失败");
+				e = new RestServiceException(auditLogThread, System.currentTimeMillis() - start, "VOIP Account日志检索失败");
 			}
 			throw ((RestServiceException) e);
 		}
-		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VOIP日志检索成功",
+		return serviceLogResponse(auditLogThread, System.currentTimeMillis() - start, request, "VOIP Account日志检索成功",
 				logPage, 0);
 	}
 	
diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
index 7384278..6cfa2d2 100644
--- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
+++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml
@@ -39,6 +39,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 	</resultMap>
 
 	<resultMap id="NtcHttpLogMap" type="com.nis.domain.restful.NtcHttpLog">
@@ -59,7 +61,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
-
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="req_hdr_file" jdbcType="VARCHAR" property="reqHdrFile" />
@@ -86,7 +89,9 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
-
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		
 		<result column="rd" jdbcType="INTEGER" property="rd" />
 		<result column="qr" jdbcType="INTEGER" property="qr" />
 		<result column="ra" jdbcType="INTEGER" property="ra" />
@@ -120,6 +125,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="mail_proto" jdbcType="VARCHAR" property="mailProto" />
 		<result column="mail_from" jdbcType="VARCHAR" property="mailFrom" />
@@ -148,6 +155,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="sni" jdbcType="VARCHAR" property="sni" />
@@ -175,6 +184,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
 		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
@@ -200,6 +211,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
 		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
@@ -224,6 +237,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="encrypt_mode" jdbcType="VARCHAR" property="encryptMode" />
@@ -250,6 +265,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="ex_protocol" jdbcType="INTEGER" property="exProtocol" />
 		<result column="isakmp_mode" jdbcType="INTEGER" property="isakmpMode" />
@@ -274,6 +291,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="host_key" jdbcType="VARCHAR" property="hostKey" />
@@ -301,6 +320,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 
 		<result column="ftp_url" jdbcType="VARCHAR" property="ftpUrl" />
 		<result column="ftp_content" jdbcType="VARCHAR" property="ftpContent" />
@@ -324,6 +345,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 	</resultMap>
 	
 	<resultMap id="NtcDdosLogMap" type="com.nis.domain.restful.NtcDdosLog">
@@ -344,6 +367,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="attack_type" jdbcType="INTEGER" property="attackType" />
 		<result column="attack_start_time" jdbcType="TIMESTAMP" property="attackStartTime" />
@@ -372,7 +397,10 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
+		<result column="app_label" jdbcType="VARCHAR" property="appLabel" />
 		<result column="c2s_send_pkt_num" jdbcType="VARCHAR" property="c2sSendPktNum" />
 		<result column="s2c_send_pkt_num" jdbcType="VARCHAR" property="s2cSendPktNum" />
 		<result column="c2s_send_byte_num" jdbcType="VARCHAR" property="c2sSendByteNum" />
@@ -400,6 +428,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -427,6 +457,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -454,6 +486,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -481,6 +515,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -509,6 +545,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
@@ -543,6 +581,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
@@ -578,6 +618,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -606,6 +648,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -633,6 +677,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -660,6 +706,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -687,6 +735,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -715,6 +765,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="protocol" jdbcType="VARCHAR" property="protocol" />
@@ -749,6 +801,8 @@
 		<result column="cap_ip" jdbcType="VARCHAR" property="capIp" />
 		<result column="addr_list" jdbcType="VARCHAR" property="addrList" />
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
+		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
+		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
 		
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="req_line" jdbcType="VARCHAR" property="reqLine" />