am

maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java

@@ -263,7 +263,6 @@ public abstract class AbstractAuthenticationRealm{
 				navigation.setpName(rs.getString("PNAME"));
 				navigation.setxPath(rs.getString("XPATH"));
 				navigation.setHasChild(rs.getString("HASCHILD"));
-				navigation.setSortOrder(rs.getInt("SORTORDER"));
 				navigation.setVisible(rs.getInt("VISIBLE"));
 				return navigation;
 			}

maxkey-core/src/main/java/org/maxkey/domain/LoginAppsHistory.java

@@ -36,7 +36,8 @@ public class LoginAppsHistory extends JpaBaseDomain {
 	@Column
 	private String loginTime;
 	
-	
+	String startDate;
+	String endDate;
 	
 	/**
 	 * 
@@ -172,6 +173,26 @@ public class LoginAppsHistory extends JpaBaseDomain {
 	}
 
 
+	public String getStartDate() {
+		return startDate;
+	}
+
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */

maxkey-core/src/main/java/org/maxkey/domain/LoginHistory.java

@@ -3,6 +3,9 @@ package org.maxkey.domain;
 import java.io.Serializable;
 
 import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
@@ -19,6 +22,10 @@ public class LoginHistory  extends JpaBaseDomain  implements Serializable{
 	 * 
 	 */
 	private static final long serialVersionUID = -1321470643357719383L;
+	@Id
+	@Column
+	@GeneratedValue(strategy=GenerationType.AUTO,generator="uuid")
+	String id;
 	@Column
 	String sessionId;
 	@Column
@@ -50,269 +57,165 @@ public class LoginHistory  extends JpaBaseDomain  implements Serializable{
 	@Column
 	String logoutTime;
 	
+	String startDate;
+	String endDate;
 	
 	public LoginHistory() {
 		super();
 	}
 
-
-	/**
-	 * @return the uid
-	 */
-	public String getUid() {
-		return uid;
+	public String getId() {
+		return id;
 	}
 
-
-	/**
-	 * @param uid the uid to set
-	 */
-	public void setUid(String uid) {
-		this.uid = uid;
+	public void setId(String id) {
+		this.id = id;
 	}
 
-
-	/**
-	 * @return the username
-	 */
-	public String getUsername() {
-		return username;
-	}
-
-
-	/**
-	 * @param username the username to set
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-
-	/**
-	 * @return the displayName
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-
-	/**
-	 * @param displayName the displayName to set
-	 */
-	public void setDisplayName(String displayName) {
-		this.displayName = displayName;
-	}
-
-
-	/**
-	 * @return the sourceIp
-	 */
-	public String getSourceIp() {
-		return sourceIp;
-	}
-
-
-	/**
-	 * @param sourceIp the sourceIp to set
-	 */
-	public void setSourceIp(String sourceIp) {
-		this.sourceIp = sourceIp;
-	}
-
-
-	/**
-	 * @return the loginType
-	 */
-	public String getLoginType() {
-		return loginType;
-	}
-
-
-	/**
-	 * @param loginType the loginType to set
-	 */
-	public void setLoginType(String loginType) {
-		this.loginType = loginType;
-	}
-
-
-	/**
-	 * @return the message
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-
-	/**
-	 * @param message the message to set
-	 */
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-
-	/**
-	 * @return the loginTime
-	 */
-	public String getLoginTime() {
-		return loginTime;
-	}
-
-
-	/**
-	 * @param loginTime the loginTime to set
-	 */
-	public void setLoginTime(String loginTime) {
-		this.loginTime = loginTime;
-	}
-
-
-	/**
-	 * @return the code
-	 */
-	public String getCode() {
-		return code;
-	}
-
-
-	/**
-	 * @param code the code to set
-	 */
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-
-	/**
-	 * @return the provider
-	 */
-	public String getProvider() {
-		return provider;
-	}
-
-
-	/**
-	 * @param provider the provider to set
-	 */
-	public void setProvider(String provider) {
-		this.provider = provider;
-	}
-
-
-	/**
-	 * @return the logoutTime
-	 */
-	public String getLogoutTime() {
-		return logoutTime;
-	}
-
-
-	/**
-	 * @param logoutTime the logoutTime to set
-	 */
-	public void setLogoutTime(String logoutTime) {
-		this.logoutTime = logoutTime;
-	}
-
-
-	/**
-	 * @return the sessionId
-	 */
 	public String getSessionId() {
 		return sessionId;
 	}
 
-
-	/**
-	 * @param sessionId the sessionId to set
-	 */
 	public void setSessionId(String sessionId) {
 		this.sessionId = sessionId;
 	}
 
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+	}
+
+	public String getLoginType() {
+		return loginType;
+	}
+
+	public void setLoginType(String loginType) {
+		this.loginType = loginType;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getProvider() {
+		return provider;
+	}
+
+	public void setProvider(String provider) {
+		this.provider = provider;
+	}
+
+	public String getSourceIp() {
+		return sourceIp;
+	}
+
+	public void setSourceIp(String sourceIp) {
+		this.sourceIp = sourceIp;
+	}
 
-	/**
-	 * @return the browser
-	 */
 	public String getBrowser() {
 		return browser;
 	}
 
-
-	/**
-	 * @param browser the browser to set
-	 */
 	public void setBrowser(String browser) {
 		this.browser = browser;
 	}
 
-
-	/**
-	 * @return the platform
-	 */
 	public String getPlatform() {
 		return platform;
 	}
 
-
-	/**
-	 * @param platform the platform to set
-	 */
 	public void setPlatform(String platform) {
 		this.platform = platform;
 	}
 
-
-	/**
-	 * @return the application
-	 */
 	public String getApplication() {
 		return application;
 	}
 
-
-	/**
-	 * @param application the application to set
-	 */
 	public void setApplication(String application) {
 		this.application = application;
 	}
 
-
-	/**
-	 * @return the loginUrl
-	 */
 	public String getLoginUrl() {
 		return loginUrl;
 	}
 
-
-	/**
-	 * @param loginUrl the loginUrl to set
-	 */
 	public void setLoginUrl(String loginUrl) {
 		this.loginUrl = loginUrl;
 	}
 
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "LoginHistory [sessionId=" + sessionId + ", uid=" + uid
-				+ ", username=" + username + ", loginType=" + loginType
-				+ ", message=" + message + ", code=" + code + ", provider="
-				+ provider +  ", sourceIp="
-				+ sourceIp + ", browser=" + browser + ", platform=" + platform
-				+ ", application=" + application + ", loginUrl=" + loginUrl
-				+ ", loginTime=" + loginTime + ", logoutTime=" + logoutTime
-				+ "]";
+	public String getLoginTime() {
+		return loginTime;
 	}
 
-	
-	
+	public void setLoginTime(String loginTime) {
+		this.loginTime = loginTime;
+	}
+
+	public String getLogoutTime() {
+		return logoutTime;
+	}
+
+	public void setLogoutTime(String logoutTime) {
+		this.logoutTime = logoutTime;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	@Override
+	public String toString() {
+		return "LoginHistory [id=" + id + ", sessionId=" + sessionId + ", uid=" + uid + ", username=" + username
+				+ ", displayName=" + displayName + ", loginType=" + loginType + ", message=" + message + ", code="
+				+ code + ", provider=" + provider + ", sourceIp=" + sourceIp + ", browser=" + browser + ", platform="
+				+ platform + ", application=" + application + ", loginUrl=" + loginUrl + ", loginTime=" + loginTime
+				+ ", logoutTime=" + logoutTime + ", startDate=" + startDate + ", endDate=" + endDate + "]";
+	}
 
 
 }

maxkey-core/src/main/java/org/maxkey/domain/Logs.java

@@ -24,7 +24,13 @@ public class Logs extends JpaBaseDomain implements Serializable {
 	String username;
 	String code;
 	String createdBy;
-
+	String createdDate;
+	String modifiedBy;
+	String modifiedDate;
+	
+	String startDate;
+	String endDate;
+	
 	public Logs() {
 		super();
 	}
@@ -114,6 +120,62 @@ public class Logs extends JpaBaseDomain implements Serializable {
 		this.code = code;
 	}
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCreatedBy() {
+		return createdBy;
+	}
+
+	public void setCreatedBy(String createdBy) {
+		this.createdBy = createdBy;
+	}
+
+	public String getCreatedDate() {
+		return createdDate;
+	}
+
+	public void setCreatedDate(String createdDate) {
+		this.createdDate = createdDate;
+	}
+
+	public String getModifiedBy() {
+		return modifiedBy;
+	}
+
+	public void setModifiedBy(String modifiedBy) {
+		this.modifiedBy = modifiedBy;
+	}
+
+	public String getModifiedDate() {
+		return modifiedDate;
+	}
+
+	public void setModifiedDate(String modifiedDate) {
+		this.modifiedDate = modifiedDate;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
 
 
 }

maxkey-core/src/main/java/org/maxkey/domain/Navigations.java

@@ -30,7 +30,6 @@ public class Navigations extends JpaBaseDomain  implements java.io.Serializable
 	private String pName;
 	private String xPath;
 	private String hasChild;
-	private int sortOrder;
 	private int  visible;
 	
 	
@@ -126,13 +125,6 @@ public class Navigations extends JpaBaseDomain  implements java.io.Serializable
 		this.hasChild = hasChild;
 	}
 
-	public int getSortOrder() {
-		return sortOrder;
-	}
-
-	public void setSortOrder(int sortOrder) {
-		this.sortOrder = sortOrder;
-	}
 
 	public int getVisible() {
 		return visible;

maxkey-core/src/main/java/org/maxkey/domain/apps/Applications.java

@@ -223,14 +223,6 @@ public class Applications extends JpaBaseDomain implements Serializable{
 
 
 
-	public int getSortOrder() {
-		return sortOrder;
-	}
-
-	public void setSortOrder(int sortOrder) {
-		this.sortOrder = sortOrder;
-	}
-
 	/**
 	 * @param secret the secret to set
 	 */