diff --git a/maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java b/maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java index 1848d8a51..b932d25bf 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java +++ b/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; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Accounts.java b/maxkey-core/src/main/java/org/maxkey/domain/Accounts.java index d9e386f29..0a9396351 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Accounts.java +++ b/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 diff --git a/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java b/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java index 974af0b19..1ec7983a1 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java +++ b/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{ /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java b/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java index 204861b65..6a87e310f 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java +++ b/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{ /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Groups.java b/maxkey-core/src/main/java/org/maxkey/domain/Groups.java index 3000920e1..ea5a476c1 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Groups.java +++ b/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; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java index 09db932a3..e57142127 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java +++ b/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{ /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java index b2ebdfa6c..1f6b4527b 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java +++ b/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; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java b/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java index ec7feeb31..b5f577721 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java +++ b/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 diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java b/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java index 59e61a95c..cf6317f73 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java +++ b/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; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java b/maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java index 15cce1e3d..1850b8e27 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java +++ b/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; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java index feb1dda24..16b2700c2 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java +++ b/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 diff --git a/maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java b/maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java index 0367f746e..0268cdabb 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java +++ b/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 diff --git a/maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java b/maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java index fbfc6ba5c..c0f46d2a0 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java +++ b/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; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Roles.java b/maxkey-core/src/main/java/org/maxkey/domain/Roles.java index 21beafa92..de3034bfb 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Roles.java +++ b/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; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java b/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java index 0c54db48b..8480aeac5 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java +++ b/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; // diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java index ba598ee26..9d2c01914 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java +++ b/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 { /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java index 2ce39c242..bf2ba4abb 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java +++ b/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 { /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java index 601433261..68f006adb 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java +++ b/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 { diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java index 4fe142f83..3f627fa37 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java +++ b/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 { /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java index a4af959f6..a7e3eb548 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java +++ b/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 { /** * diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java index b29c9eeb7..0399feff3 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java +++ b/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 { /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java index 010b25302..b9a9dd4cf 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java +++ b/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 { /** diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java index 9543b35f3..8adbf045f 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java +++ b/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 { /** diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml index 58d1173f8..2a8e1817e 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml +++ b/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) diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml index 6bec9dfbf..40e9397ce 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml @@ -5,8 +5,8 @@ SELECT * FROM - APPS_CAS_DETAILS CD, - APPS APP + MXK_APPS_CAS_DETAILS CD, + MXK_APPS APP WHERE APP.ID = #{value} AND CD.ID = #{value} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml index e0c09a624..665023159 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml @@ -6,8 +6,8 @@ SELECT * FROM - APPS_DESKTOP_DETAILS DD, - APPS APP + MXK_APPS_DESKTOP_DETAILS DD, + MXK_APPS APP WHERE APP.ID = #{value} AND DD.ID = #{value} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml index 57d7d38dc..f8f4c7fd3 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml @@ -6,8 +6,8 @@ SELECT * FROM - APPS_FORM_BASED_DETAILS FBD, - APPS APP + MXK_APPS_FORM_BASED_DETAILS FBD, + MXK_APPS APP WHERE APP.ID = #{value} AND FBD.ID = #{value} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml index 25e980385..b8c5bdcc5 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml +++ b/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) @@ -37,7 +37,7 @@ - INSERT INTO APPS( + INSERT INTO MXK_APPS( ID, NAME, ICON, @@ -113,7 +113,7 @@ - UPDATE APPS SET + UPDATE MXK_APPS SET NAME = #{name}, 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 AND U.ID = #{userId} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml index 44c62394f..34492fd25 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml +++ b/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, - APPS APP + MXK_APPS_SAML_V20_DETAILS SVD, + MXK_APPS APP WHERE APP.ID = #{value} AND SVD.ID = #{value} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml index 60b3f9341..7dbed1c8e 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml @@ -6,8 +6,8 @@ SELECT * FROM - APPS_TOKEN_BASED_DETAILS TBD, - APPS APP + MXK_APPS_TOKEN_BASED_DETAILS TBD, + MXK_APPS APP WHERE APP.ID = #{value} AND TBD.ID = #{value} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml index b94faafdd..ba2c290ea 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml +++ b/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 @@ -97,9 +97,9 @@ U.STATUS FROM - USERINFO U, - `GROUPS` G, - GROUP_MEMBER GM + MXK_USERINFO U, + `MXK_GROUPS` G, + MXK_GROUP_MEMBER GM WHERE 1 = 1 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 AND GM.GROUPID = #{groupId} @@ -178,9 +178,9 @@ SELECT DISTINCT IG.* FROM - `GROUPS` IG, - `GROUPS` G, - GROUP_MEMBER GM + `MXK_GROUPS` IG, + `MXK_GROUPS` G, + MXK_GROUP_MEMBER GM WHERE 1 = 1 AND GM.GROUPID = G.ID diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml index b4aedfdfb..e2b9ae67e 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml @@ -32,8 +32,8 @@ APPS.VENDOR, APPS.VENDORURL FROM - APPS APPS, - GROUP_PRIVILEGES GP + MXK_APPS APPS, + 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} ) diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml index e3ca8b449..520822186 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml +++ b/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) @@ -25,7 +25,7 @@ - UPDATE `GROUPS` SET + UPDATE `MXK_GROUPS` SET STATUS = '2' WHERE 1 = 1 @@ -38,7 +38,7 @@ - UPDATE `GROUPS` SET STATUS='2' WHERE ID IN + UPDATE `MXK_GROUPS` SET STATUS='2' WHERE ID IN #{item} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml index 977a81b36..1363b3ec3 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml +++ b/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 diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml index 828848f5f..4ca32ef28 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml +++ b/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 @@ -64,7 +64,7 @@ - UPDATE HISTORY_LOGIN SET + UPDATE MXK_HISTORY_LOGIN SET LOGOUTTIME = current_timestamp() WHERE SESSIONID = #{value} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml index 123a1d50b..9d493e704 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml +++ b/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 diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml index 51f70e8f7..78a5eb9ac 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml @@ -23,14 +23,14 @@ - UPDATE ORGANIZATIONS SET STATUS = '2' + UPDATE MXK_ORGANIZATIONS SET STATUS = '2' WHERE 1 = 1 AND ID = #{id} @@ -47,7 +47,7 @@ - UPDATE ORGANIZATIONS SET STATUS = '2' + UPDATE MXK_ORGANIZATIONS SET STATUS = '2' WHERE ID IN #{selectId} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml index 2d6174fd5..6bb43c4a8 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml +++ b/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} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml index 34a796714..0533daf35 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml @@ -5,25 +5,25 @@ @@ -32,7 +32,7 @@ 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 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 diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml index 70d073e67..74dcdd4cc 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml +++ b/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 @@ -32,7 +32,7 @@ - UPDATE RESOURCES SET + UPDATE MXK_RESOURCES SET STATUS = '2' WHERE 1 = 1 @@ -45,7 +45,7 @@ - UPDATE RESOURCES SET STATUS='2' WHERE ID IN + UPDATE MXK_RESOURCES SET STATUS='2' WHERE ID IN #{item} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml index eb9b511fc..82c2ec087 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml +++ b/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 @@ -97,9 +97,9 @@ U.STATUS FROM - USERINFO U, - ROLES R, - ROLE_MEMBER RM + MXK_USERINFO U, + MXK_ROLES R, + MXK_ROLE_MEMBER RM WHERE 1 = 1 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 AND RM.ROLEID = #{roleId} @@ -178,9 +178,9 @@ SELECT DISTINCT IR.* FROM - ROLES IR, - ROLES R, - ROLE_MEMBER RM + MXK_ROLES IR, + MXK_ROLES R, + MXK_ROLE_MEMBER RM WHERE 1 = 1 AND RM.GROUPID = R.ID diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml index 245639291..0b8083126 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml +++ b/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) @@ -25,7 +25,7 @@ - UPDATE ROLES SET + UPDATE MXK_ROLES SET STATUS = '2' WHERE 1 = 1 @@ -38,7 +38,7 @@ - UPDATE ROLES SET STATUS='2' WHERE ID IN + UPDATE MXK_ROLES SET STATUS='2' WHERE ID IN #{item} @@ -49,7 +49,7 @@ SELECT * FROM - ROLE_PERMISSIONS + MXK_ROLE_PERMISSIONS WHERE STATUS = 1 @@ -65,14 +65,14 @@ - UPDATE ROLE_PERMISSIONS SET STATUS=9 WHERE ID IN + UPDATE MXK_ROLE_PERMISSIONS SET STATUS=9 WHERE ID IN #{item.id} - INSERT INTO ROLE_PERMISSIONS ( ID,APPID,ROLEID,RESOURCEID,STATUS) + INSERT INTO MXK_ROLE_PERMISSIONS ( ID,APPID,ROLEID,RESOURCEID,STATUS) VALUES (#{item.id},#{item.appId},#{item.roleId},#{item.resourceId},#{item.status}) diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml index 2422396e1..14749698f 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml +++ b/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} @@ -50,7 +50,7 @@ STATUS FROM - USERINFO + MXK_USERINFO WHERE (1=1) @@ -72,7 +72,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET ISLOCKED = #{isLocked}, @@ -82,7 +82,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET ISLOCKED = #{isLocked}, BADPWDCOUNT = 0, @@ -94,7 +94,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET PASSWORD = #{password}, DECIPHERABLE = #{decipherable}, @@ -106,7 +106,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET SHAREDSECRET = #{sharedSecret}, SHAREDCOUNTER = #{sharedCounter}, @@ -117,7 +117,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET APPLOGINPASSWORD = #{appLoginPassword}, @@ -127,7 +127,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET PROTECTEDAPPS = #{protectedApps}, @@ -137,7 +137,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET PASSWORDQUESTION = #{passwordQuestion}, PASSWORDANSWER = #{passwordAnswer}, @@ -148,7 +148,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET AUTHNTYPE = #{authnType}, @@ -158,7 +158,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET EMAIL = #{email}, @@ -174,7 +174,7 @@ - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET MOBILE = #{mobile}, @@ -187,14 +187,14 @@ - UPDATE USERINFO SET STATUS='2' WHERE ID IN + UPDATE MXK_USERINFO SET STATUS='2' WHERE ID IN #{item} - UPDATE USERINFO SET + UPDATE MXK_USERINFO SET DISPLAYNAME = #{displayName}, NICKNAME = #{nickName}, NAMEZHSPELL = #{nameZhSpell}, diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java index 7740582d6..b93c2f55e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java +++ b/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 rowMapper = new ClientDetailsRowMapper();