Maxkey v1.0 GA

Maxkey v1.0 GA

maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java

@@ -16,6 +16,8 @@ public interface UserInfoMapper  extends IJpaBaseMapper<UserInfo>{
 	
 	public int logisticDeleteAllByCid(String cid);
 	
+	public UserInfo loadByUsername(String username);
+	
 	public void locked(UserInfo userInfo);
 
 	public void unlock(UserInfo userInfo);

maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java

@@ -75,6 +75,9 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
 		return false;
 	}
 
+	public UserInfo loadByUsername(String username) {
+		return getMapper().loadByUsername(username);
+	}
 	
 	public UserInfo loadByAppIdAndUsername(String appId,String username){
 		try {

maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml

@@ -6,10 +6,10 @@
 		SELECT DISTINCT
 			APP.*
 		FROM
-			APPLICATIONS APP,GROUP_APP GA
+			APPS APP,GROUP_PRIVILEGES GP
 		WHERE
-			APP.ID=GA.APPID
-			AND GA.GROUPID IN(
+			APP.ID=GP.APPID
+			AND GP.GROUPID IN(
 				SELECT 
 					G.ID
 				FROM  
@@ -34,7 +34,7 @@
 		<if test="name != null and name != ''">
 			AND NAME 	= 	#{name}
 		</if>
-		ORDER BY SORTORDER 
+		ORDER BY SORTINDEX
 	</select>
 
 </mapper>

maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml

@@ -2,6 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.maxkey.dao.persistence.UserInfoMapper">
 	
+	<select id="loadByUsername" parameterType="string" resultType="UserInfo">
+    	SELECT 
+			*
+    	FROM
+			USERINFO
+		WHERE	USERNAME = #{value}
+    </select>
+    
 	<select id="queryPageResults" parameterType="UserInfo" resultType="UserInfo">
 		SELECT
 			ID,