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

v2.9.0GA & SQL data

Browse Source
This commit is contained in:
MaxKey
2021-08-20 09:11:13 +08:00
parent 5d6eabe7f1
commit 68dcbce728
44 changed files with 182 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
maxkey-core/src/main/java/org/maxkey/entity/Accounts.java
View File

@@ -45,7 +45,7 @@ public class Accounts extends JpaBaseEntity implements Serializable {
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
private String id;
@Column
private String uid;
private String userId;
@Column
private String username;
@Column
@@ -72,22 +72,22 @@ public class Accounts extends JpaBaseEntity implements Serializable {
}
public Accounts(String uid, String appId) {
this.uid = uid;
this.userId = uid;
this.appId = appId;
}
public Accounts(String uid, String appId, String password) {
this.uid = uid;
this.userId = uid;
this.appId = appId;
this.relatedPassword = password;
}
public String getUid() {
return uid;
public String getUserId() {
return userId;
}
public void setUid(String uid) {
this.uid = uid;
public void setUserId(String uid) {
this.userId = uid;
}
public String getUsername() {
@@ -158,7 +158,7 @@ public class Accounts extends JpaBaseEntity implements Serializable {
@Override
public String toString() {
return "AppAccounts [uid=" + uid + ", username=" + username + ", displayName=" + displayName + ", appId="
return "AppAccounts [uid=" + userId + ", username=" + username + ", displayName=" + displayName + ", appId="
+ appId + ", appName=" + appName + ", relatedUsername=" + relatedUsername + ", relatedPassword="
+ relatedPassword + "]";
}

12
maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java
View File

@@ -27,7 +27,7 @@ public class ChangePassword extends JpaBaseEntity{
private static final long serialVersionUID = -2362608803392892403L;
private String id;
private String uid;
private String userId;
private String username;
private String email;
private String mobile;
@@ -66,16 +66,16 @@ public class ChangePassword extends JpaBaseEntity{
/**
* @return the uid
*/
public String getUid() {
return uid;
public String getUserId() {
return userId;
}
/**
* @param uid the uid to set
*/
public void setUid(String uid) {
this.uid = uid;
public void setUserId(String uid) {
this.userId = uid;
}
@@ -215,7 +215,7 @@ public class ChangePassword extends JpaBaseEntity{
builder.append("ChangePassword [id=");
builder.append(id);
builder.append(", uid=");
builder.append(uid);
builder.append(userId);
builder.append(", username=");
builder.append(username);
builder.append(", displayName=");

14
maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java
View File

@@ -48,7 +48,7 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{
@Column
String sessionId;
@Column
String uid;
String userId;
@Column
String username;
@Column
@@ -99,12 +99,12 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{
this.sessionId = sessionId;
}
public String getUid() {
return uid;
public String getUserId() {
return userId;
}
public void setUid(String uid) {
this.uid = uid;
public void setUserId(String userId) {
this.userId = userId;
}
public String getUsername() {
@@ -234,8 +234,8 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{
builder.append(id);
builder.append(", sessionId=");
builder.append(sessionId);
builder.append(", uid=");
builder.append(uid);
builder.append(", userId=");
builder.append(userId);
builder.append(", username=");
builder.append(username);
builder.append(", displayName=");

16
maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java
View File

@@ -46,7 +46,7 @@ public class HistoryLoginApps extends JpaBaseEntity {
@Column
private String appName;
@Column
private String uid;
private String userId;
@Column
private String username;
@Column
@@ -144,18 +144,18 @@ public class HistoryLoginApps extends JpaBaseEntity {
/**
* @return the uid
* @return the userId
*/
public String getUid() {
return uid;
public String getUserId() {
return userId;
}
/**
* @param uid the uid to set
*/
public void setUid(String uid) {
this.uid = uid;
public void setUserId(String uid) {
this.userId = uid;
}
@@ -222,8 +222,8 @@ public class HistoryLoginApps extends JpaBaseEntity {
builder.append(appId);
builder.append(", appName=");
builder.append(appName);
builder.append(", uid=");
builder.append(uid);
builder.append(", userId=");
builder.append(userId);
builder.append(", username=");
builder.append(username);
builder.append(", displayName=");

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

@@ -28,7 +28,7 @@ import javax.persistence.Table;
/*
ID varchar(40) not null,
APPROLEID varchar(40) null,
UID varchar(40) null
USERID varchar(40) null
constraint PK_ROLES primary key clustered (ID)
*/
@Entity

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

@@ -28,7 +28,7 @@ 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 , sessionstatus)values( ? , ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)";
private static final String HISTORY_LOGIN_INSERT_STATEMENT = "insert into mxk_history_login (id , sessionid , userid , username , displayname , logintype , message , code , provider , sourceip , browser , platform , application , loginurl , sessionstatus)values( ? , ? , ? , ? , ? , ?, ? , ? , ?, ? , ? , ?, ? , ? , ?)";
private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "update mxk_history_login set logouttime = ? ,sessionstatus = 7 where sessionid = ?";