Merge branch 'master' into master_dev_lyp

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

@@ -60,7 +60,7 @@ public interface UserInfoMapper  extends IJpaBaseMapper<UserInfo>{
 	
 	public int updateProfile(UserInfo userInfo);
 	   
-    @Select("SELECT * FROM  USERINFO WHERE   EMAIL = #{value} OR MOBILE= #{value}")
+    @Select("SELECT * FROM  MXK_USERINFO WHERE   EMAIL = #{value} OR MOBILE= #{value}")
     public UserInfo queryUserInfoByEmailMobile(String emailMobile);
 	
 }

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml

@@ -158,29 +158,24 @@
         SELECT DISTINCT
             APP.*
         FROM
-            MXK_APPS APP,MXK_GROUP_PRIVILEGES GP
+            MXK_APPS APP,MXK_GROUP_PRIVILEGES GP,MXK_GROUPS G
         WHERE
             APP.ID=GP.APPID
-            AND GP.GROUPID IN(
-                SELECT 
-                    G.ID
-                FROM  
-                    `MXK_GROUPS` G
-                WHERE 
-                    G.ID='ALL_USER_GROUP'
-                    OR G.ID IN(
+            AND GP.GROUPID=G.ID
+            AND (
+            	 G.ID='ROLE_ALL_USER'
+                 OR G.ID IN(
                       SELECT 
                         GM.GROUPID 
                       FROM 
                         MXK_GROUP_MEMBER GM,MXK_USERINFO U 
-                      WHERE 1   =   1
+                      WHERE GM.MEMBERID    =   U.ID 
                         <if test="userId != null and userId != ''">
                             AND U.ID        =   #{userId}
                         </if>
                         <if test="username != null and username != ''">
                             AND  U.USERNAME =   #{username}
                         </if>
-                        AND  GM.MEMBERID    =   U.ID 
                     )
             )
         <if test="name != null and name != ''">

maxkey-persistence/src/test/resources/application.properties

@@ -24,7 +24,7 @@ spring.servlet.multipart.max-file-size=4194304
 #server.servlet.encoding.force=true
 #datasource
 spring.datasource.username=root
-spring.datasource.password=maxkey
+spring.datasource.password=root
 spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8&serverTimezone=UTC
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource