MXK

表名添加前缀MXK，防止歧义

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

@@ -58,29 +58,29 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 public abstract class AbstractAuthenticationRealm {
     private static Logger _logger = LoggerFactory.getLogger(AbstractAuthenticationRealm.class);
 
-    private static final String LOCK_USER_UPDATE_STATEMENT = "UPDATE USERINFO SET ISLOCKED = ?  , UNLOCKTIME = ? WHERE ID = ?";
+    private static final String LOCK_USER_UPDATE_STATEMENT = "UPDATE MXK_USERINFO SET ISLOCKED = ?  , UNLOCKTIME = ? WHERE ID = ?";
 
-    private static final String UNLOCK_USER_UPDATE_STATEMENT = "UPDATE USERINFO SET ISLOCKED = ? , UNLOCKTIME = ? WHERE ID = ?";
+    private static final String UNLOCK_USER_UPDATE_STATEMENT = "UPDATE MXK_USERINFO SET ISLOCKED = ? , UNLOCKTIME = ? WHERE ID = ?";
 
-    private static final String BADPASSWORDCOUNT_UPDATE_STATEMENT = "UPDATE USERINFO SET BADPASSWORDCOUNT = ? , BADPASSWORDTIME = ?  WHERE ID = ?";
+    private static final String BADPASSWORDCOUNT_UPDATE_STATEMENT = "UPDATE MXK_USERINFO SET BADPASSWORDCOUNT = ? , BADPASSWORDTIME = ?  WHERE ID = ?";
 
-    private static final String BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT = "UPDATE USERINFO SET BADPASSWORDCOUNT = ? , ISLOCKED = ? ,UNLOCKTIME = ?  WHERE ID = ?";
+    private static final String BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT = "UPDATE MXK_USERINFO SET BADPASSWORDCOUNT = ? , ISLOCKED = ? ,UNLOCKTIME = ?  WHERE ID = ?";
 
-    private static final String HISTORY_LOGIN_INSERT_STATEMENT = "INSERT INTO HISTORY_LOGIN (ID , SESSIONID , UID , USERNAME , DISPLAYNAME , LOGINTYPE , MESSAGE , CODE , PROVIDER , SOURCEIP , BROWSER , PLATFORM , APPLICATION , LOGINURL )VALUES( ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)";
+    private static final String HISTORY_LOGIN_INSERT_STATEMENT = "INSERT INTO MXK_HISTORY_LOGIN (ID , SESSIONID , UID , USERNAME , DISPLAYNAME , LOGINTYPE , MESSAGE , CODE , PROVIDER , SOURCEIP , BROWSER , PLATFORM , APPLICATION , LOGINURL )VALUES( ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)";
 
-    private static final String LOGIN_USERINFO_UPDATE_STATEMENT = "UPDATE USERINFO SET LASTLOGINTIME = ?  , LASTLOGINIP = ? , LOGINCOUNT = ?, ONLINE = "
+    private static final String LOGIN_USERINFO_UPDATE_STATEMENT = "UPDATE MXK_USERINFO SET LASTLOGINTIME = ?  , LASTLOGINIP = ? , LOGINCOUNT = ?, ONLINE = "
             + UserInfo.ONLINE.ONLINE + "  WHERE ID = ?";
 
-    private static final String LOGOUT_USERINFO_UPDATE_STATEMENT = "UPDATE USERINFO SET LASTLOGOFFTIME = ? , ONLINE = "
+    private static final String LOGOUT_USERINFO_UPDATE_STATEMENT = "UPDATE MXK_USERINFO SET LASTLOGOFFTIME = ? , ONLINE = "
             + UserInfo.ONLINE.OFFLINE + "  WHERE ID = ?";
 
-    private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "UPDATE HISTORY_LOGIN SET LOGOUTTIME = ?  WHERE  SESSIONID = ?";
+    private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "UPDATE MXK_HISTORY_LOGIN SET LOGOUTTIME = ?  WHERE  SESSIONID = ?";
 
-    private static final String GROUPS_SELECT_STATEMENT = "SELECT DISTINCT G.ID,G.NAME FROM USERINFO U,`GROUPS` G,GROUP_MEMBER GM WHERE U.ID = ?  AND U.ID=GM.MEMBERID AND GM.GROUPID=G.ID ";
+    private static final String GROUPS_SELECT_STATEMENT = "SELECT DISTINCT G.ID,G.NAME FROM MXK_USERINFO U,`MXK_GROUPS` G,MXK_GROUP_MEMBER GM WHERE U.ID = ?  AND U.ID=GM.MEMBERID AND GM.GROUPID=G.ID ";
 
-    private static final String DEFAULT_USERINFO_SELECT_STATEMENT = "SELECT * FROM	USERINFO WHERE USERNAME = ?";
+    private static final String DEFAULT_USERINFO_SELECT_STATEMENT = "SELECT * FROM	MXK_USERINFO WHERE USERNAME = ?";
 
-    private static final String PASSWORD_POLICY_SELECT_STATEMENT = "SELECT ID,MINLENGTH,MAXLENGTH,LOWERCASE,UPPERCASE,DIGITS,SPECIALCHAR,ATTEMPTS,DURATION,EXPIRATION,USERNAME,SIMPLEPASSWORDS FROM PASSWORD_POLICY ";
+    private static final String PASSWORD_POLICY_SELECT_STATEMENT = "SELECT ID,MINLENGTH,MAXLENGTH,LOWERCASE,UPPERCASE,DIGITS,SPECIALCHAR,ATTEMPTS,DURATION,EXPIRATION,USERNAME,SIMPLEPASSWORDS FROM MXK_PASSWORD_POLICY ";
 
     protected PasswordPolicy passwordPolicy;
 

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

@@ -36,7 +36,7 @@ import org.hibernate.validator.constraints.Length;
    constraint PK_ROLES primary key clustered (ID)
  */
 
-@Table(name = "ACCOUNTS")
+@Table(name = "MXK_ACCOUNTS")
 public class Accounts extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = 6829592256223630307L;
     @Id

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

@@ -32,7 +32,7 @@ import javax.persistence.Table;
    UID	                varchar(40)	                   null
    constraint PK_ROLES primary key clustered (ID)
  */
-@Table(name = "GROUP_MEMBER")  
+@Table(name = "MXK_GROUP_MEMBER")  
 public class GroupMember extends UserInfo implements Serializable{
 
 	/**

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

@@ -34,7 +34,7 @@ import org.maxkey.domain.apps.Apps;
    MENUID                varchar(40)	                   null
    constraint PK_ROLES primary key clustered (ID)
  */
-@Table(name = "GROUP_PRIVILEGES")  
+@Table(name = "MXK_GROUP_PRIVILEGES")  
 public class GroupPrivileges extends Apps implements Serializable{
 
 	/**

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

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 import org.hibernate.validator.constraints.Length;
 
-@Table(name = "GROUPS")
+@Table(name = "MXK_GROUPS")
 public class Groups extends JpaBaseDomain implements Serializable {
 
     private static final long serialVersionUID = 4660258495864814777L;

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

@@ -32,7 +32,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
  * @author Crystal.Sea
  *
  */
-@Table(name = "HISTORY_LOGIN")  
+@Table(name = "MXK_HISTORY_LOGIN")  
 public class HistoryLogin  extends JpaBaseDomain  implements Serializable{
 	
 	/**

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

@@ -30,7 +30,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
  *
  */
 
-@Table(name = "HISTORY_LOGIN_APPS")  
+@Table(name = "MXK_HISTORY_LOGIN_APPS")  
 public class HistoryLoginApps extends JpaBaseDomain {
 	
 	private static final long serialVersionUID = 5085201575292304749L;

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

@@ -30,7 +30,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
  * @author Crystal.Sea
  * 
  */
-@Table(name = "HISTORY_LOGS")
+@Table(name = "MXK_HISTORY_LOGS")
 public class HistoryLogs extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = 6560201093784960493L;
     @Id

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

@@ -25,7 +25,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 
-@Table(name = "ORGANIZATIONS")
+@Table(name = "MXK_ORGANIZATIONS")
 public class Organizations extends JpaBaseDomain implements Serializable {
 
     private static final long serialVersionUID = 5085413816404119803L;

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

@@ -32,7 +32,7 @@ import org.maxkey.exception.PasswordPolicyException;
  *
  */
 
-@Table(name = "PASSWORD_POLICY")
+@Table(name = "MXK_PASSWORD_POLICY")
 public class PasswordPolicy extends JpaBaseDomain implements java.io.Serializable {
 
     private static final long serialVersionUID = -4797776994287829182L;

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

@@ -25,7 +25,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 
-@Table(name = "RESOURCES")
+@Table(name = "MXK_RESOURCES")
 public class Resources  extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = 2567171742999638608L;
     @Id

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

@@ -30,7 +30,7 @@ import javax.persistence.Table;
    UID	                varchar(40)	                   null
    constraint PK_ROLES primary key clustered (ID)
  */
-@Table(name = "ROLE_MEMBER")
+@Table(name = "MXK_ROLE_MEMBER")
 public class RoleMember extends UserInfo implements Serializable {
     private static final long serialVersionUID = -8059639972590554760L;
     @Id

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

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 import org.maxkey.constants.ConstantsStatus;
 
-@Table(name = "ROLE_PERMISSIONS")
+@Table(name = "MXK_ROLE_PERMISSIONS")
 public class RolePermissions  extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = -8783585691243853899L;
     

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

@@ -25,7 +25,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 
-@Table(name = "ROLES")
+@Table(name = "MXK_ROLES")
 public class Roles extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = -7515832728504943821L;
     

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

@@ -34,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Crystal.Sea
  * 
  */
-@Table(name = "USERINFO")
+@Table(name = "MXK_USERINFO")
 public class UserInfo extends JpaBaseDomain {
     private static final long serialVersionUID = 6402443942083382236L;
     //

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

@@ -31,7 +31,7 @@ import org.maxkey.constants.Boolean;
 import org.maxkey.domain.Accounts;
 import org.springframework.web.multipart.MultipartFile;
 
-@Table(name = "APPS")
+@Table(name = "MXK_APPS")
 public class Apps extends JpaBaseDomain implements Serializable {
 
     /**

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

@@ -23,7 +23,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-@Table(name = "APPS_CAS_DETAILS")
+@Table(name = "MXK_APPS_CAS_DETAILS")
 public class AppsCasDetails extends Apps {
 
     /**

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

@@ -29,7 +29,7 @@ import org.maxkey.domain.Accounts;
  * @author Crystal.Sea
  *
  */
-@Table(name = "APPS_DESKTOP_DETAILS")  
+@Table(name = "MXK_APPS_DESKTOP_DETAILS")  
 public class AppsDesktopDetails extends Apps {
 
 

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

@@ -19,7 +19,7 @@ package org.maxkey.domain.apps;
 
 import javax.persistence.Table;
 
-@Table(name = "APPS_EXTENDAPI_DETAILS") 
+@Table(name = "MXK_APPS_EXTENDAPI_DETAILS") 
 public class AppsExtendApiDetails extends Apps {
 
 	/**

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

@@ -27,7 +27,7 @@ import javax.persistence.Table;
  * @author Crystal.Sea
  *
  */
-@Table(name = "APPS_FORM_BASED_DETAILS")  
+@Table(name = "MXK_APPS_FORM_BASED_DETAILS")  
 public class AppsFormBasedDetails  extends Apps {
 	/**
 	 * 

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

@@ -22,7 +22,7 @@ import javax.persistence.Table;
 import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails;
 import org.springframework.util.StringUtils;
 
-@Table(name = "APPS_OAUTH_CLIENT_DETAILS")
+@Table(name = "MXK_APPS_OAUTH_CLIENT_DETAILS")
 public class AppsOAuth20Details extends Apps {
 
     /**

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

@@ -31,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Crystal.Sea
  *
  */
-@Table(name = "APPS_SAML_V20_DETAILS")
+@Table(name = "MXK_APPS_SAML_V20_DETAILS")
 public class AppsSAML20Details extends Apps {
 
     /**

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

@@ -30,7 +30,7 @@ import javax.persistence.Table;
  * @author Crystal.Sea
  *
  */
-@Table(name = "APPS_TOKEN_BASED_DETAILS") 
+@Table(name = "MXK_APPS_TOKEN_BASED_DETAILS") 
 public class AppsTokenBasedDetails  extends Apps {
 
 	/**

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

@@ -23,7 +23,7 @@
 		SELECT
 			*
 		FROM
-			ACCOUNTS
+			MXK_ACCOUNTS
 		WHERE
 			 (1=1)	
 		<include refid="where_statement"/>

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

@@ -5,8 +5,8 @@
     	SELECT 
 			*
     	FROM 
-    		APPS_CAS_DETAILS CD,
+    		MXK_APPS_CAS_DETAILS CD,
-    		APPS APP
+    		MXK_APPS APP
     	WHERE 	
     		APP.ID	=	#{value}
     		AND CD.ID	=	#{value}

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

@@ -6,8 +6,8 @@
     	SELECT 
 			*
     	FROM 
-    		APPS_DESKTOP_DETAILS DD,
+    		MXK_APPS_DESKTOP_DETAILS DD,
-    		APPS APP
+    		MXK_APPS APP
     	WHERE 	
     		APP.ID	=	#{value}
     		AND DD.ID	=	#{value}

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

@@ -6,8 +6,8 @@
     	SELECT 
 			*
     	FROM 
-    		APPS_FORM_BASED_DETAILS FBD,
+    		MXK_APPS_FORM_BASED_DETAILS FBD,
-    		APPS APP
+    		MXK_APPS APP
     	WHERE 	
     		APP.ID	=	#{value}
     		AND FBD.ID	=	#{value}

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

@@ -28,7 +28,7 @@
 		SELECT
 			*
 		FROM
-			APPS
+			MXK_APPS
 		WHERE
 			 (1=1)	
 		<include refid="where_statement"/>
@@ -37,7 +37,7 @@
 	
 		
 	<insert id="insertApp" parameterType="Apps">
-		INSERT INTO APPS(
+		INSERT INTO MXK_APPS(
 			ID,
 			NAME,
 			ICON,
@@ -113,7 +113,7 @@
 	</insert>
 	
 	<update id="updateApp" parameterType="Apps" >
-    	UPDATE APPS SET
+    	UPDATE MXK_APPS SET
     		NAME			=	#{name},
     		<if test="icon != null">
 			ICON			=	#{icon},
@@ -157,21 +157,21 @@
         SELECT DISTINCT
             APP.*
         FROM
-            APPS APP,GROUP_PRIVILEGES GP
+            MXK_APPS APP,MXK_GROUP_PRIVILEGES GP
         WHERE
             APP.ID=GP.APPID
             AND GP.GROUPID IN(
                 SELECT 
                     G.ID
                 FROM  
-                    `GROUPS` G
+                    `MXK_GROUPS` G
                 WHERE 
                     G.ID='ALL_USER_GROUP'
                     OR G.ID IN(
                       SELECT 
                         GM.GROUPID 
                       FROM 
-                        GROUP_MEMBER GM,USERINFO U 
+                        MXK_GROUP_MEMBER GM,MXK_USERINFO U 
                       WHERE 1   =   1
                         <if test="userId != null and userId != ''">
                             AND U.ID        =   #{userId}

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

@@ -21,8 +21,8 @@
     		SVD.DIGESTMETHOD,
 			APP.*
     	FROM 
-    		APPS_SAML_V20_DETAILS SVD,
+    		MXK_APPS_SAML_V20_DETAILS SVD,
-    		APPS APP
+    		MXK_APPS APP
     	WHERE 	
     		APP.ID			=	#{value}
     		AND SVD.ID		=	#{value}

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

@@ -6,8 +6,8 @@
     	SELECT 
 			*
     	FROM 
-    		APPS_TOKEN_BASED_DETAILS TBD,
+    		MXK_APPS_TOKEN_BASED_DETAILS TBD,
-    		APPS APP
+    		MXK_APPS APP
     	WHERE 	
     		APP.ID	=	#{value}
     		AND TBD.ID	=	#{value}

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

@@ -53,7 +53,7 @@
 					
 					U.STATUS
 				FROM
-					USERINFO U
+					MXK_USERINFO U
 			WHERE	1	=	1
 	</select>
 	
@@ -97,9 +97,9 @@
 				
 				U.STATUS
 			FROM
-				USERINFO U,
+				MXK_USERINFO U,
-				`GROUPS` G,
+				`MXK_GROUPS` G,
-				GROUP_MEMBER GM
+				MXK_GROUP_MEMBER GM
 			WHERE	1	=	1
 				<if test="groupId != null and groupId != ''">
 					AND GM.GROUPID = #{groupId}
@@ -154,11 +154,11 @@
 			
 			U.STATUS
 		FROM
-			USERINFO U
+			MXK_USERINFO U
 		WHERE
 			U.ID NOT IN(
        			 SELECT GM.MEMBERID 
-       			 FROM 	`GROUPS` G,GROUP_MEMBER GM
+       			 FROM 	`MXK_GROUPS` G,MXK_GROUP_MEMBER GM
 			     WHERE  1  =  1
 			     <if test="groupId != null and groupId != ''">
 					AND GM.GROUPID = #{groupId}
@@ -178,9 +178,9 @@
 		SELECT	DISTINCT
 			IG.*
 		FROM
-			`GROUPS` IG,
+			`MXK_GROUPS` IG,
-			`GROUPS` G,
+			`MXK_GROUPS` G,
-			GROUP_MEMBER GM
+			MXK_GROUP_MEMBER GM
 		WHERE
 			 1	=	1
 			AND GM.GROUPID	=	G.ID	

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

@@ -32,8 +32,8 @@
             APPS.VENDOR,
             APPS.VENDORURL
 		FROM
-			APPS APPS,
+			MXK_APPS APPS,
-			GROUP_PRIVILEGES    GP
+			MXK_GROUP_PRIVILEGES    GP
 		WHERE
 			GP.APPID=APPS.ID
 			AND GP.GROUPID	=	#{groupId}
@@ -44,14 +44,14 @@
 		SELECT
 			*
 		FROM
-			APPS APPS
+			MXK_APPS APPS
 		WHERE
 			 1	=	1
 			AND  APPS.ID NOT IN(
 				SELECT 
 					APPID
 				FROM
-					GROUP_PRIVILEGES
+					MXK_GROUP_PRIVILEGES
 				WHERE 
 					GROUPID	=	#{groupId}
 			)

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

@@ -17,7 +17,7 @@
 		SELECT
 			*
 		FROM
-			`GROUPS`
+			`MXK_GROUPS`
 		WHERE
 			 (1=1)	
 		<include refid="where_statement"/>
@@ -25,7 +25,7 @@
 	
 	
 	<update id="logisticDelete" parameterType="Groups" >
-    	UPDATE `GROUPS` SET
+    	UPDATE `MXK_GROUPS` SET
     		STATUS	=	'2'  
     	WHERE	1	=	1
     	<if test="id != null">
@@ -38,7 +38,7 @@
     
     
     <update id="logisticBatchDelete" parameterType="java.util.List">
-    	UPDATE `GROUPS` SET STATUS='2' WHERE ID IN
+    	UPDATE `MXK_GROUPS` SET STATUS='2' WHERE ID IN
     		<foreach item="item" collection="list" open="(" separator="," close=")">
 				#{item}
     		</foreach>

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

@@ -44,7 +44,7 @@
 			DISPLAYNAME,
 			DATE_FORMAT(LOGINTIME, '%Y-%m-%d  %H:%i:%s') AS LOGINTIME
 			 
-    	FROM HISTORY_LOGIN_APPS
+    	FROM MXK_HISTORY_LOGIN_APPS
     	WHERE	1	=	1
     	<include refid="dao_where_statement"/>
     	

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

@@ -56,7 +56,7 @@
 			LOGINURL,
 			DATE_FORMAT(LOGINTIME, '%Y-%m-%d  %H:%i:%s') AS LOGINTIME,
 			DATE_FORMAT(LOGOUTTIME, '%Y-%m-%d  %H:%i:%s') AS LOGOUTTIME
-    	FROM HISTORY_LOGIN
+    	FROM MXK_HISTORY_LOGIN
     	WHERE	1	=	1
     	<include refid="dao_where_statement"/>
     	
@@ -64,7 +64,7 @@
     </select>
     
     <update id="logout" parameterType="java.lang.String" >
-    	UPDATE HISTORY_LOGIN SET
+    	UPDATE MXK_HISTORY_LOGIN SET
 			LOGOUTTIME			=	current_timestamp() 
 		WHERE
 			SESSIONID	=	#{value}

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

@@ -45,7 +45,7 @@
 			USERNAME,
 			CREATEDDATE,
 			CREATEDBY
-    	FROM HISTORY_LOGS 
+    	FROM MXK_HISTORY_LOGS 
     	WHERE	1	=	1
     	<include refid="where_statement"/>
     	

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

@@ -23,14 +23,14 @@
      <select id="queryPageResults" parameterType="Organizations" resultType="Organizations">
     	SELECT 
 			*
-    	FROM ORGANIZATIONS 
+    	FROM MXK_ORGANIZATIONS 
     	WHERE	1	=	1
     	<include refid="dao_where_statement"/>
     </select>
     
   
     <update id="logisticDelete" parameterType="Organizations" >
-    	UPDATE ORGANIZATIONS SET STATUS	=	'2'  
+    	UPDATE MXK_ORGANIZATIONS SET STATUS	=	'2'  
     		WHERE	1	=	1
     	<if test="id != null and id != '' ">
 			AND	ID	=	#{id}
@@ -47,7 +47,7 @@
     </update>
     
     <update id="logisticBatchDelete" parameterType="java.util.List">
-    	UPDATE ORGANIZATIONS SET STATUS	=	'2'  
+    	UPDATE MXK_ORGANIZATIONS SET STATUS	=	'2'  
     		 WHERE ID IN
 		<foreach collection="ids" item="selectId"  open="(" separator="," close=")">  
         	#{selectId}   

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

@@ -15,7 +15,7 @@
 			ID,
 			WORKEMAIL EAMIL
 		FROM
-			REGISTRATION
+			MXK_REGISTRATION
 		WHERE 
 			WORKEMAIL = #{value}
 	</select>

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

@@ -5,25 +5,25 @@
 	<select id="analysisDay" parameterType="String" resultType="Integer">
     	SELECT 
     		COUNT(ID) REPORTCOUNT
-    	FROM history_login 
+    	FROM MXK_history_login 
     	WHERE 
     		DATE(LOGINTIME) =curdate()
     </select>
     <!-- 本月新用户统计 -->
     <select id="analysisNewUsers" parameterType="String" resultType="Integer">
-    	SELECT COUNT(*) REPORTCOUNT FROM USERINFO 
+    	SELECT COUNT(*) REPORTCOUNT FROM MXK_USERINFO 
 		WHERE 
 		last_day(CREATEDDATE) =last_day(curdate())
     </select>
     <!-- 在线用户统计 -->
     <select id="analysisOnlineUsers" parameterType="String" resultType="Integer">
-    	    SELECT COUNT(*) REPORTCOUNT FROM USERINFO 
+    	    SELECT COUNT(*) REPORTCOUNT FROM MXK_USERINFO 
 			WHERE 
 			LASTLOGINTIME -LASTLOGOFFTIME
     </select>
     <!-- 30天活跃用户统计 -->
     <select id="analysisActiveUsers" parameterType="String" resultType="Integer">
-    	SELECT COUNT(*) REPORTCOUNT FROM USERINFO 
+    	SELECT COUNT(*) REPORTCOUNT FROM MXK_USERINFO 
 		WHERE 
 		DATE(LASTLOGINTIME) >date_add(curdate(), interval - day(curdate()) -31 day)
     </select>
@@ -32,7 +32,7 @@
 	<select id="analysisDayHour" parameterType="String" resultType="Map">
     	SELECT 
     		COUNT(ID) REPORTCOUNT, HOUR(LOGINTIME) REPORTSTRING 
-    	FROM history_login 
+    	FROM MXK_history_login 
     	WHERE 
     		DATE(LOGINTIME) =curdate()
     	GROUP BY REPORTSTRING
@@ -41,7 +41,7 @@
     <select id="analysisMonth" parameterType="String" resultType="Map">
     	SELECT 
     		COUNT(ID) REPORTCOUNT, DATE(LOGINTIME) REPORTSTRING 
-    	FROM history_login 
+    	FROM MXK_history_login 
     	WHERE 
     		DATE(LOGINTIME) >date_add(curdate(), interval - day(curdate()) -31 day)
     	GROUP BY REPORTSTRING
@@ -51,7 +51,7 @@
     <select id="analysisBrowser" parameterType="Map" resultType="Map">
     	SELECT 
     		COUNT(ID) REPORTCOUNT, BROWSER REPORTSTRING 
-    	FROM history_login 
+    	FROM MXK_history_login 
     	WHERE 
     		DATE(LOGINTIME) >date_add(curdate(), interval - day(curdate()) -31 day)
     	GROUP BY REPORTSTRING
@@ -60,7 +60,7 @@
     <!-- 30天应用单点登录的访问统计 -->
 	<select id="analysisApp" parameterType="Map" resultType="Map">
     	SELECT COUNT(ID) REPORTCOUNT,APPNAME 
-    	FROM HISTORY_LOGIN_APPS
+    	FROM MXK_HISTORY_LOGIN_APPS
     	WHERE 
     		DATE(LOGINTIME) >date_add(curdate(), interval - day(curdate()) -31 day)
     	GROUP BY APPNAME ORDER BY REPORTCOUNT DESC

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

@@ -23,7 +23,7 @@
 		SELECT
 			RES.*,APP.NAME APPNAME
 		FROM
-			RESOURCES RES, APPS APP
+			MXK_RESOURCES RES, MXK_APPS APP
 		WHERE
 			 (1=1)	AND RES.APPID=APP.ID
 		<include refid="where_statement"/>
@@ -32,7 +32,7 @@
 	
 	
 	<update id="logisticDelete" parameterType="Resources" >
-    	UPDATE RESOURCES SET
+    	UPDATE MXK_RESOURCES SET
     		STATUS	=	'2'  
     	WHERE	1	=	1
     	<if test="id != null">
@@ -45,7 +45,7 @@
     
     
     <update id="logisticBatchDelete" parameterType="java.util.List">
-    	UPDATE RESOURCES SET STATUS='2' WHERE ID IN
+    	UPDATE MXK_RESOURCES SET STATUS='2' WHERE ID IN
     		<foreach item="item" collection="list" open="(" separator="," close=")">
 				#{item}
     		</foreach>

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

@@ -53,7 +53,7 @@
 					
 					U.STATUS
 				FROM
-					USERINFO U
+					MXK_USERINFO U
 			WHERE	1	=	1
 	</select>
 	
@@ -97,9 +97,9 @@
 				
 				U.STATUS
 			FROM
-				USERINFO U,
+				MXK_USERINFO U,
-				ROLES R,
+				MXK_ROLES R,
-				ROLE_MEMBER RM
+				MXK_ROLE_MEMBER RM
 			WHERE	1	=	1
 				<if test="roleId != null and roleId != ''">
 					AND RM.ROLEID = #{roleId}
@@ -154,11 +154,11 @@
 			
 			U.STATUS
 		FROM
-			USERINFO U
+			MXK_USERINFO U
 		WHERE
 			U.ID NOT IN(
        			 SELECT RM.MEMBERID 
-       			 FROM 	ROLES R,ROLE_MEMBER RM
+       			 FROM 	MXK_ROLES R,MXK_ROLE_MEMBER RM
 			     WHERE  1  =  1
 			     <if test="roleId != null and roleId != ''">
 					AND RM.ROLEID = #{roleId}
@@ -178,9 +178,9 @@
 		SELECT	DISTINCT
 			IR.*
 		FROM
-			ROLES IR,
+			MXK_ROLES IR,
-			ROLES R,
+			MXK_ROLES R,
-			ROLE_MEMBER RM
+			MXK_ROLE_MEMBER RM
 		WHERE
 			 1	=	1
 			AND RM.GROUPID	=	R.ID	

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

@@ -17,7 +17,7 @@
 		SELECT
 			*
 		FROM
-			ROLES
+			MXK_ROLES
 		WHERE
 			 (1=1)	
 		<include refid="where_statement"/>
@@ -25,7 +25,7 @@
 	
 	
 	<update id="logisticDelete" parameterType="Groups" >
-    	UPDATE ROLES SET
+    	UPDATE MXK_ROLES SET
     		STATUS	=	'2'  
     	WHERE	1	=	1
     	<if test="id != null">
@@ -38,7 +38,7 @@
     
     
     <update id="logisticBatchDelete" parameterType="java.util.List">
-    	UPDATE ROLES SET STATUS='2' WHERE ID IN
+    	UPDATE MXK_ROLES SET STATUS='2' WHERE ID IN
     		<foreach item="item" collection="list" open="(" separator="," close=")">
 				#{item}
     		</foreach>
@@ -49,7 +49,7 @@
         SELECT
             *
         FROM
-            ROLE_PERMISSIONS
+            MXK_ROLE_PERMISSIONS
         WHERE
              STATUS = 1
        <if test="id != null and id != ''">
@@ -65,14 +65,14 @@
     </select>
     
     <update id="logisticDeleteRolePermissions" parameterType="java.util.List">
-        UPDATE ROLE_PERMISSIONS SET STATUS=9 WHERE ID IN
+        UPDATE MXK_ROLE_PERMISSIONS SET STATUS=9 WHERE ID IN
             <foreach item="item" collection="list" open="(" separator="," close=")">
                 #{item.id}
             </foreach>
     </update>
     
     <insert id="insertRolePermissions"  parameterType="java.util.List">
-	    INSERT INTO ROLE_PERMISSIONS ( ID,APPID,ROLEID,RESOURCEID,STATUS) 
+	    INSERT INTO MXK_ROLE_PERMISSIONS ( ID,APPID,ROLEID,RESOURCEID,STATUS) 
 	    VALUES 
 	    <foreach collection="list" item="item" index="index" separator=",">
 	        (#{item.id},#{item.appId},#{item.roleId},#{item.resourceId},#{item.status})

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

@@ -6,7 +6,7 @@
     	SELECT 
 			*
     	FROM
-			USERINFO
+			MXK_USERINFO
 		WHERE	USERNAME = #{value}
     </select>
     
@@ -50,7 +50,7 @@
 			
 			STATUS
 		FROM
-			USERINFO
+			MXK_USERINFO
 		WHERE
 			 (1=1)	
 		<if test="username != null and username != ''">
@@ -72,7 +72,7 @@
 	</select>
 	
     <update id="locked" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="isLocked != null">
     		ISLOCKED		=	#{isLocked},
 			</if>
@@ -82,7 +82,7 @@
     </update>
     
     <update id="lockout" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="isLocked != null">
     		ISLOCKED		=	#{isLocked},
     		BADPWDCOUNT		=	0,
@@ -94,7 +94,7 @@
     </update>
     	
 	<update id="changePassword" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="password != null">
     		PASSWORD			=	#{password},
 			DECIPHERABLE		=	#{decipherable},
@@ -106,7 +106,7 @@
     </update>
     
     <update id="changeSharedSecret" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="sharedSecret != null">
     		SHAREDSECRET		=	#{sharedSecret},
 			SHAREDCOUNTER		=	#{sharedCounter},
@@ -117,7 +117,7 @@
     </update>
     
     <update id="changeAppLoginPassword" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="appLoginPassword != null">
     		APPLOGINPASSWORD		=	#{appLoginPassword},
 			</if>
@@ -127,7 +127,7 @@
     </update>
     
     <update id="updateProtectedApps" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="protectedApps != null">
     		PROTECTEDAPPS		=	#{protectedApps},
 			</if>
@@ -137,7 +137,7 @@
     </update>
     
     <update id="changePasswordQuestion" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="passwordAnswer != null">
     		PASSWORDQUESTION	=	#{passwordQuestion},
 			PASSWORDANSWER		=	#{passwordAnswer},
@@ -148,7 +148,7 @@
     </update>
 	
 	<update id="changeAuthnType" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="authnType != null">
     		AUTHNTYPE	=	#{authnType},
 			</if>
@@ -158,7 +158,7 @@
     </update>
     
     <update id="changeEmail" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="email != null">
     		EMAIL	=	#{email},
 			</if>
@@ -174,7 +174,7 @@
     </update>
     
     <update id="changeMobile" parameterType="UserInfo" >
-    	UPDATE USERINFO SET
+    	UPDATE MXK_USERINFO SET
     		<if test="mobile != null">
     		MOBILE			=	#{mobile},
 			</if>
@@ -187,14 +187,14 @@
     </update>
     
     <update id="logisticBatchDelete" parameterType="java.util.List">
-    	UPDATE USERINFO SET STATUS='2' WHERE ID IN
+    	UPDATE MXK_USERINFO SET STATUS='2' WHERE ID IN
     		<foreach item="item" collection="list" open="(" separator="," close=")">
 				#{item}
     		</foreach>
 	</update>
 	
     <update id="updateProfile" parameterType="UserInfo" >
-        UPDATE USERINFO SET
+        UPDATE MXK_USERINFO SET
             DISPLAYNAME     =   #{displayName},
             NICKNAME        =   #{nickName},
             NAMEZHSPELL     =   #{nameZhSpell},

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java

@@ -67,22 +67,22 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
     private static final String CLIENT_FIELDS = "client_secret, " + CLIENT_FIELDS_FOR_UPDATE;
 
     private static final String BASE_FIND_STATEMENT = "select client_id, " + CLIENT_FIELDS
-            + " from apps_oauth_client_details";
+            + " from mxk_apps_oauth_client_details";
 
     private static final String DEFAULT_FIND_STATEMENT = BASE_FIND_STATEMENT + " order by client_id";
 
     private static final String DEFAULT_SELECT_STATEMENT = BASE_FIND_STATEMENT + " where client_id = ?";
 
-    private static final String DEFAULT_INSERT_STATEMENT = "insert into apps_oauth_client_details (" + CLIENT_FIELDS
+    private static final String DEFAULT_INSERT_STATEMENT = "insert into mxk_apps_oauth_client_details (" + CLIENT_FIELDS
             + ", client_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
-    private static final String DEFAULT_UPDATE_STATEMENT = "update apps_oauth_client_details " + "set "
+    private static final String DEFAULT_UPDATE_STATEMENT = "update mxk_apps_oauth_client_details " + "set "
             + CLIENT_FIELDS_FOR_UPDATE.replaceAll(", ", "=?, ") + "=? where client_id = ?";
 
-    private static final String DEFAULT_UPDATE_SECRET_STATEMENT = "update apps_oauth_client_details "
+    private static final String DEFAULT_UPDATE_SECRET_STATEMENT = "update mxk_apps_oauth_client_details "
             + "set client_secret = ? where client_id = ?";
 
-    private static final String DEFAULT_DELETE_STATEMENT = "delete from apps_oauth_client_details where client_id = ?";
+    private static final String DEFAULT_DELETE_STATEMENT = "delete from mxk_apps_oauth_client_details where client_id = ?";
 
     private RowMapper<ClientDetails> rowMapper = new ClientDetailsRowMapper();