Merge branch 'Release-1.1' into develop

src/main/java/com/nis/domain/ServicesRequestLog.java

@@ -42,6 +42,7 @@ public class ServicesRequestLog implements Serializable {
 	private String exceptionInfo;
 	private String serverIp;
 	private String traceCode;
+	private String requestURI;
 	
 	/**
 	 * serverIp
@@ -224,4 +225,17 @@ public class ServicesRequestLog implements Serializable {
 		this.traceCode = traceCode;
 	}
 	
+	/**
+	 * @param requestURI the requestURI to set
+	 */
+	public void setRequestURI(String requestURI) {
+		this.requestURI = requestURI;
+	}
+	
+	/**
+	 * @return the requestURI
+	 */
+	public String getRequestURI() {
+		return requestURI;
+	}
 }

src/main/java/com/nis/domain/SwaggerLog.java

@@ -3,7 +3,7 @@ package com.nis.domain;
 import java.util.Date;
 
 public class SwaggerLog extends BaseEntity<SwaggerLog> {
-	private static final long serialVersionUID = 5351369774420087482L;
+	private static final long serialVersionUID = 1L;
 	private String operator;
 	private String version;
 	private Integer opAction;
@@ -16,13 +16,13 @@ public class SwaggerLog extends BaseEntity<SwaggerLog> {
 	private String exceptionInfo;
 	private String serverIp;
 	private String traceCode;
+	private String requestUri;
 
 	private String exception;// 界面的异常信息框
 
 	private Date beginDate; // 开始日期
 	private Date endDate; // 结束日期
 
-
 	public String getOperator() {
 		return operator;
 	}
@@ -143,4 +143,12 @@ public class SwaggerLog extends BaseEntity<SwaggerLog> {
 		this.endDate = endDate;
 	}
 
+	public String getRequestUri() {
+		return requestUri;
+	}
+
+	public void setRequestUri(String requestUri) {
+		this.requestUri = requestUri;
+	}
+
 }