fix

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

@@ -149,7 +149,7 @@ public class Navigations extends JpaBaseDomain  implements java.io.Serializable
 		return "Navigations [name=" + name + ", url=" + url + ", type=" + type
 				+ ", target=" + target + ", pId=" + pId + ", pName=" + pName
 				+ ", xPath=" + xPath + ", hasChild=" + hasChild
-				+ ", sortOrder=" + sortOrder + ", visible=" + visible
+				+", visible=" + visible
 				+ ", childNavs=" + childNavs + "]";
 	}
 

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

@@ -106,7 +106,7 @@ public class Applications extends JpaBaseDomain implements Serializable{
 
 	protected Accounts appUser;
 	
-	protected int sortOrder;
+	protected int sortIndex;
 	
 	protected String description;
 	
@@ -242,8 +242,13 @@ public class Applications extends JpaBaseDomain implements Serializable{
 	}
 
 
+	public int getSortIndex() {
+		return sortIndex;
+	}
 
-
+	public void setSortIndex(int sortIndex) {
+		this.sortIndex = sortIndex;
+	}
 
 	/**
 	 * @param icon the icon to set

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

@@ -64,7 +64,7 @@ public class OAuth20Details  extends Applications {
 		this.setIcon(application.getIcon());
 		this.clientId=application.getId();
 		
-		this.setSortOrder(application.getSortOrder());
+		this.setSortIndex(application.getSortIndex());
 		this.setVendor(application.getVendor());
 		this.setVendorUrl(application.getVendorUrl());
 		

maxkey-core/src/test/java/com/connsec/crypto/SCryptPasswordEncoderTest.java

@@ -1,6 +1,6 @@
 package com.connsec.crypto;
 
-import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 public class SCryptPasswordEncoderTest {
 
@@ -10,11 +10,12 @@ public class SCryptPasswordEncoderTest {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
-		SCryptPasswordEncoder pe=new SCryptPasswordEncoder();
-		String c="$e0801$7Holo9EgzBeg5xf/WLZu3/5IQwOyEPDLJPgMXkF9jnekBrbQUMt4CF9O2trkz3zBCnCLpUMR437q/AjQ5TTToA==$oYB8KRSxAsxkKkt5r79W6r6P0wTUcKwGye1ivXRN0Ts="
-		;
-				System.out.println(pe.encode("shimingxy")+"_password");
-				System.out.println(pe.matches("shimingxy"+"_password", c));
+		BCryptPasswordEncoder pe=new BCryptPasswordEncoder();
+		//String c="$e0801$7Holo9EgzBeg5xf/WLZu3/5IQwOyEPDLJPgMXkF9jnekBrbQUMt4CF9O2trkz3zBCnCLpUMR437q/AjQ5TTToA==$oYB8KRSxAsxkKkt5r79W6r6P0wTUcKwGye1ivXRN0Ts="
+		//;
+		System.out.println(pe.encode("admin"));
+			//	System.out.println(pe.encode("shimingxy")+"_password");
+				//System.out.println(pe.matches("shimingxy"+"_password", c));
 	}
 
 }