LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SnowFlakeId Generator

Browse Source
This commit is contained in:
MaxKey
2021-04-17 17:02:38 +08:00
parent c47e5f2009
commit b96db810f8
38 changed files with 369 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java
View File

@@ -32,6 +32,9 @@ import org.maxkey.crypto.password.MessageDigestPasswordEncoder;
import org.maxkey.crypto.password.PasswordReciprocal;
import org.maxkey.crypto.password.SM3PasswordEncoder;
import org.maxkey.crypto.password.StandardPasswordEncoder;
import org.maxkey.util.IdGenerator;
import org.maxkey.util.SnowFlakeId;
import org.maxkey.web.WebContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -183,6 +186,23 @@ public class ApplicationAutoConfiguration implements InitializingBean {
@Value("${maxkey.saml.v20.sp.issuing.entity.id}") String spIssuingEntityName) {
return spIssuingEntityName;
}
/**
* spKeyStoreLoader .
* @return
*/
@Bean(name = "idGenerator")
public IdGenerator idGenerator(
@Value("${maxkey.id.strategy:SnowFlake}") String strategy,
@Value("${maxkey.id.datacenterId:0}") int datacenterId,
@Value("${maxkey.id.machineId:0}") int machineId) {
IdGenerator idGenerator = new IdGenerator(strategy);
SnowFlakeId SnowFlakeId = new SnowFlakeId(datacenterId,machineId);
idGenerator.setSnowFlakeId(SnowFlakeId);
WebContext.idGenerator = idGenerator;
return idGenerator;
}
@Override

2
maxkey-core/src/main/java/org/maxkey/domain/Accounts.java
View File

@@ -42,7 +42,7 @@ public class Accounts extends JpaBaseDomain implements Serializable {
private static final long serialVersionUID = 6829592256223630307L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
private String id;
@Column
private String uid;

2
maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java
View File

@@ -43,7 +43,7 @@ public class GroupMember extends UserInfo implements Serializable{
private static final long serialVersionUID = -8059639972590554760L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="uuid")
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
String id;
@Column
private String groupId;

2
maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java
View File

@@ -45,7 +45,7 @@ public class GroupPrivileges extends Apps implements Serializable{
private static final long serialVersionUID = 8634166407201007340L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="uuid")
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
String id;
@Column
private String groupId;

2
maxkey-core/src/main/java/org/maxkey/domain/Groups.java
View File

@@ -33,7 +33,7 @@ public class Groups extends JpaBaseDomain implements Serializable {
private static final long serialVersionUID = 4660258495864814777L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
String id;
@Length(max = 60)

2
maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java
View File

@@ -43,7 +43,7 @@ public class HistoryLogin extends JpaBaseDomain implements Serializable{
private static final long serialVersionUID = -1321470643357719383L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="uuid")
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
String id;
@Column
String sessionId;

2
maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java
View File

@@ -37,7 +37,7 @@ public class HistoryLoginApps extends JpaBaseDomain {
private static final long serialVersionUID = 5085201575292304749L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="uuid")
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
String id;
@Column
private String sessionId;

2
maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java
View File

@@ -37,7 +37,7 @@ public class HistoryLogs extends JpaBaseDomain implements Serializable {
private static final long serialVersionUID = 6560201093784960493L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
String id;
@Column
String serviceName;

2
maxkey-core/src/main/java/org/maxkey/domain/Notices.java
View File

@@ -22,7 +22,7 @@ public class Notices extends JpaBaseDomain implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
protected String id;
/**
*

2
maxkey-core/src/main/java/org/maxkey/domain/Organizations.java
View File

@@ -33,7 +33,7 @@ public class Organizations extends JpaBaseDomain implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
private String id;
@Column
private String code;

2
maxkey-core/src/main/java/org/maxkey/domain/Resources.java
View File

@@ -32,7 +32,7 @@ public class Resources extends JpaBaseDomain implements Serializable {
private static final long serialVersionUID = 2567171742999638608L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO,generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid")
String id;
@Column
String name;

2
maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java
View File

@@ -37,7 +37,7 @@ public class RoleMember extends UserInfo implements Serializable {
private static final long serialVersionUID = -8059639972590554760L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
String id;
@Column
private String roleId;

5
maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java
View File

@@ -26,6 +26,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
import org.maxkey.constants.ConstantsStatus;
import org.maxkey.web.WebContext;
@Entity
@Table(name = "MXK_ROLE_PERMISSIONS")
@@ -34,7 +35,7 @@ public class RolePermissions extends JpaBaseDomain implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
String id;
@Column
String appId;
@@ -60,7 +61,7 @@ public class RolePermissions extends JpaBaseDomain implements Serializable {
* @param resourceId String
*/
public RolePermissions(String appId, String roleId, String resourceId) {
this.id = this.generateId();
this.id = WebContext.genId();
this.appId = appId;
this.roleId = roleId;
this.resourceId = resourceId;

2
maxkey-core/src/main/java/org/maxkey/domain/Roles.java
View File

@@ -33,7 +33,7 @@ public class Roles extends JpaBaseDomain implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO,generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid")
private String id;
@Column
private String name;

2
maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
View File

@@ -43,7 +43,7 @@ public class UserInfo extends JpaBaseDomain {
//
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
String id;
@Column
protected String username;

2
maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java
View File

@@ -37,7 +37,7 @@ public class UserInfoAdjoint extends JpaBaseDomain {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
String id;
protected String displayName;

4
maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java
View File

@@ -28,9 +28,9 @@ import org.springframework.jdbc.core.JdbcTemplate;
public class LoginHistoryService {
private static Logger _logger = LoggerFactory.getLogger(LoginHistoryService.class);
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 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 HISTORY_LOGOUT_UPDATE_STATEMENT = "UPDATE MXK_HISTORY_LOGIN SET LOGOUTTIME = ? WHERE SESSIONID = ?";
private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "update mxk_history_login set logouttime = ? where sessionid = ?";
protected JdbcTemplate jdbcTemplate;

26
maxkey-core/src/main/java/org/maxkey/persistence/db/LoginService.java
View File

@@ -38,29 +38,29 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
public class LoginService {
private static Logger _logger = LoggerFactory.getLogger(LoginService.class);
private static final String LOCK_USER_UPDATE_STATEMENT = "UPDATE MXK_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 MXK_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 MXK_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 MXK_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 LOGIN_USERINFO_UPDATE_STATEMENT = "UPDATE MXK_USERINFO SET LASTLOGINTIME = ? , LASTLOGINIP = ? , LOGINCOUNT = ?, ONLINE = "
+ UserInfo.ONLINE.ONLINE + " WHERE ID = ?";
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 MXK_USERINFO SET LASTLOGOFFTIME = ? , ONLINE = "
+ UserInfo.ONLINE.OFFLINE + " WHERE ID = ?";
private static final String LOGOUT_USERINFO_UPDATE_STATEMENT = "update mxk_userinfo set lastlogofftime = ? , online = "
+ UserInfo.ONLINE.OFFLINE + " where 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 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 MXK_USERINFO WHERE USERNAME = ?";
private static final String DEFAULT_USERINFO_SELECT_STATEMENT = "select * from mxk_userinfo where username = ?";
private static final String DEFAULT_USERINFO_SELECT_STATEMENT_USERNAME_MOBILE = "SELECT * FROM MXK_USERINFO WHERE USERNAME = ? OR MOBILE = ? ";
private static final String DEFAULT_USERINFO_SELECT_STATEMENT_USERNAME_MOBILE = "select * from mxk_userinfo where username = ? or mobile = ? ";
private static final String DEFAULT_USERINFO_SELECT_STATEMENT_USERNAME_MOBILE_EMAIL = "SELECT * FROM MXK_USERINFO WHERE USERNAME = ? OR MOBILE = ? OR EMAIL = ? ";
private static final String DEFAULT_USERINFO_SELECT_STATEMENT_USERNAME_MOBILE_EMAIL = "select * from mxk_userinfo where username = ? or mobile = ? or email = ? ";
private static final String DEFAULT_MYAPPS_SELECT_STATEMENT = "SELECT DISTINCT APP.ID,APP.NAME FROM MXK_APPS APP,MXK_GROUP_PRIVILEGES GP,MXK_GROUPS G WHERE APP.ID=GP.APPID AND GP.GROUPID=G.ID AND G.ID IN(%s)";
private static final String DEFAULT_MYAPPS_SELECT_STATEMENT = "select distinct app.id,app.name from mxk_apps app,mxk_group_privileges gp,mxk_groups g where app.id=gp.appid and gp.groupid=g.id and g.id in(%s)";
protected JdbcTemplate jdbcTemplate;

10
maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java
View File

@@ -92,15 +92,15 @@ public class PasswordPolicyValidator {
private static final String PASSWORD_POLICY_KEY = "PASSWORD_POLICY_KEY";
private static final String LOCK_USER_UPDATE_STATEMENT = "UPDATE MXK_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 PASSWORD_POLICY_SELECT_STATEMENT = "SELECT * FROM MXK_PASSWORD_POLICY ";
private static final String PASSWORD_POLICY_SELECT_STATEMENT = "select * from mxk_password_policy ";
private static final String UNLOCK_USER_UPDATE_STATEMENT = "UPDATE MXK_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 MXK_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 MXK_USERINFO SET BADPASSWORDCOUNT = ? , ISLOCKED = ? ,UNLOCKTIME = ? WHERE ID = ?";
private static final String BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT = "update mxk_userinfo set badpasswordcount = ? , islocked = ? ,unlocktime = ? where id = ?";
public PasswordPolicyValidator() {
}

9
maxkey-core/src/main/java/org/maxkey/web/WebContext.java
View File

@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory;
import org.maxkey.configuration.ApplicationConfig;
import org.maxkey.domain.UserInfo;
import org.maxkey.util.DateUtils;
import org.maxkey.util.StringGenerator;
import org.maxkey.util.IdGenerator;
import org.maxkey.web.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,6 +63,8 @@ public final class WebContext {
public static ArrayList<String> sessionAttributeNameList = new ArrayList<String>();
public static IdGenerator idGenerator;
static {
sessionAttributeNameList.add(WebConstants.CURRENT_LOGIN_USER_PASSWORD_SET_TYPE);
sessionAttributeNameList.add(WebConstants.FIRST_SAVED_REQUEST_PARAMETER);
@@ -518,7 +520,10 @@ public final class WebContext {
* @return String
*/
public static String genId() {
return (new StringGenerator()).uuidGenerate();
if(idGenerator == null) {
idGenerator = new IdGenerator();
}
return idGenerator.generate();
}
public static ModelAndView redirect(String redirectUrl) {