admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-06 17:08:29 +08:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java
View File

@ -74,7 +74,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
WebContext.setAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI, request.getParameter(SOCIALSIGNON_REDIRECT_URI));
SocialsAssociate socialSignOnUser =new SocialsAssociate();
socialSignOnUser.setProvider(provider);
socialSignOnUser.setUid(WebContext.getUserInfo().getId());
socialSignOnUser.setUserId(WebContext.getUserInfo().getId());
socialSignOnUser.setUsername(WebContext.getUserInfo().getUsername());
_logger.debug("Social Sign On unbind "+provider+" from user "+WebContext.getUserInfo().getUsername());
@ -119,7 +119,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
_logger.debug(this.accountId);
socialsAssociate =new SocialsAssociate();
socialsAssociate.setProvider(provider);
socialsAssociate.setSocialuid(this.accountId);
socialsAssociate.setSocialUserId(this.accountId);
//for login
String socialSignOnType= "";
@ -153,7 +153,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
}
socialsAssociate.setSocialUserInfo(accountJsonString);
socialsAssociate.setUid(WebContext.getUserInfo().getId());
socialsAssociate.setUserId(WebContext.getUserInfo().getId());
socialsAssociate.setUsername(WebContext.getUserInfo().getUsername());
//socialsAssociate.setAccessToken(JsonUtils.object2Json(accessToken));
//socialsAssociate.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject()));

24
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java
View File

@ -31,15 +31,15 @@ import org.springframework.jdbc.core.RowMapper;
public class JdbcSocialsAssociateService implements SocialsAssociateService{
private static final Logger _logger = LoggerFactory.getLogger(JdbcSocialsAssociateService.class);
private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "insert into mxk_socials_associate(id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)";
private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)";
private static final String DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE = "insert into mxk_socials_associate(id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)";
private static final String DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE = "insert into mxk_socials_associate(id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute )values( ? , ? , ? , ? , ?, ? , ? , ?)";
private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "select id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where provider = ? and socialuid = ?";
private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where provider = ? and socialuserid = ?";
private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "select id, uid , username , provider , socialuid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where uid = ?" ;
private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "select id, userid , username , provider , socialuserid , accesstoken , socialuserinfo , exattribute , createddate , updateddate from mxk_socials_associate where userid = ?" ;
private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "delete from mxk_socials_associate where uid = ? and provider = ?";
private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "delete from mxk_socials_associate where userid = ? and provider = ?";
private static final String DEFAULT_DEFAULT_UPDATE_STATEMENT= "update mxk_socials_associate set accesstoken = ? , socialuserinfo = ? , exattribute = ? ,updateddate = ? where id = ?";
@ -63,10 +63,10 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
jdbcTemplate.update("Oracle".equals(jdbcType)?DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE:DEFAULT_DEFAULT_INSERT_STATEMENT,
new Object[] {
socialsAssociate.getId(),
socialsAssociate.getUid(),
socialsAssociate.getUserId(),
socialsAssociate.getUsername(),
socialsAssociate.getProvider(),
socialsAssociate.getSocialuid(),
socialsAssociate.getSocialUserId(),
socialsAssociate.getAccessToken(),
socialsAssociate.getSocialUserInfo(),
socialsAssociate.getExAttribute()},
@ -78,7 +78,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
public boolean delete(SocialsAssociate socialsAssociate) {
jdbcTemplate.update(DEFAULT_DEFAULT_DELETE_STATEMENT,
new Object[] {
socialsAssociate.getUid(),
socialsAssociate.getUserId(),
socialsAssociate.getProvider()
},
new int[] {Types.VARCHAR, Types.VARCHAR});
@ -91,7 +91,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT,
new SocialsAssociateRowMapper(),
socialsAssociate.getProvider(),
socialsAssociate.getSocialuid());
socialsAssociate.getSocialUserId());
_logger.debug("list socialsAssociate "+listsocialsAssociate);
return (listsocialsAssociate.size()>0)?listsocialsAssociate.get(0):null;
}
@ -102,7 +102,7 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
List<SocialsAssociate> listsocialsAssociate=jdbcTemplate.query(
DEFAULT_DEFAULT_BIND_SELECT_STATEMENT,
new SocialsAssociateRowMapper(),
socialsAssociate.getUid());
socialsAssociate.getUserId());
_logger.debug("query bind SocialSignOnUser "+listsocialsAssociate);
return listsocialsAssociate;
}
@ -122,10 +122,10 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
throws SQLException {
SocialsAssociate socialsAssociate=new SocialsAssociate();
socialsAssociate.setId(rs.getString(1));
socialsAssociate.setUid(rs.getString(2));
socialsAssociate.setUserId(rs.getString(2));
socialsAssociate.setUsername(rs.getString(3));
socialsAssociate.setProvider(rs.getString(4));
socialsAssociate.setSocialuid(rs.getString(5));
socialsAssociate.setSocialUserId(rs.getString(5));
socialsAssociate.setAccessToken(rs.getString(6));
socialsAssociate.setSocialUserInfo(rs.getString(7));
socialsAssociate.setExAttribute(rs.getString(8));

24
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java
View File

@ -31,9 +31,9 @@ public class SocialsAssociate extends JpaBaseEntity {
private static final long serialVersionUID = 2151179554190800162L;
private String id;
private String provider;
private String uid;
private String userId;
private String username;
private String socialuid;
private String socialUserId;
private String socialUserInfo;
private String accessToken;
private String exAttribute;
@ -64,16 +64,16 @@ public class SocialsAssociate extends JpaBaseEntity {
this.provider = provider;
}
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 getSocialuid() {
return socialuid;
public String getSocialUserId() {
return socialUserId;
}
public String getUsername() {
@ -84,8 +84,8 @@ public class SocialsAssociate extends JpaBaseEntity {
this.username = username;
}
public void setSocialuid(String socialuid) {
this.socialuid = socialuid;
public void setSocialUserId(String socialUserId) {
this.socialUserId = socialUserId;
}
public String getSocialUserInfo() {
@ -136,11 +136,11 @@ public class SocialsAssociate extends JpaBaseEntity {
builder.append(", provider=");
builder.append(provider);
builder.append(", uid=");
builder.append(uid);
builder.append(userId);
builder.append(", username=");
builder.append(username);
builder.append(", socialuid=");
builder.append(socialuid);
builder.append(socialUserId);
builder.append(", socialUserInfo=");
builder.append(socialUserInfo);
builder.append(", accessToken=");

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 = ?";

6
maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java
View File

@ -53,7 +53,7 @@ public class AccountsService extends JpaBaseService<Accounts>{
public boolean insert(Accounts account) {
if (super.insert(account)) {
if(kafkaPersistService.getApplicationConfig().isKafkaSupport()) {
UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUid());
UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUserId());
account.setUserInfo(loadUserInfo);
kafkaPersistService.send(
KafkaIdentityTopic.ACCOUNT_TOPIC,
@ -69,7 +69,7 @@ public class AccountsService extends JpaBaseService<Accounts>{
public boolean update(Accounts account) {
if (super.update(account)) {
if(kafkaPersistService.getApplicationConfig().isKafkaSupport()) {
UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUid());
UserInfo loadUserInfo = userInfoService.loadUserRelated(account.getUserId());
account.setUserInfo(loadUserInfo);
kafkaPersistService.send(
KafkaIdentityTopic.ACCOUNT_TOPIC,
@ -87,7 +87,7 @@ public class AccountsService extends JpaBaseService<Accounts>{
if (super.remove(id)) {
UserInfo loadUserInfo = null;
if(kafkaPersistService.getApplicationConfig().isKafkaSupport()) {
loadUserInfo = userInfoService.loadUserRelated(account.getUid());
loadUserInfo = userInfoService.loadUserRelated(account.getUserId());
account.setUserInfo(loadUserInfo);
kafkaPersistService.send(
KafkaIdentityTopic.ACCOUNT_TOPIC,

2
maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
View File

@ -297,7 +297,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
if(userInfo.getPassword()!=null && !userInfo.getPassword().equals("")) {
ChangePassword changePassword=new ChangePassword();
changePassword.setId(userInfo.getId());
changePassword.setUid(userInfo.getId());
changePassword.setUserId(userInfo.getId());
changePassword.setUsername(userInfo.getUsername());
changePassword.setDecipherable(userInfo.getDecipherable());
changePassword.setPassword(userInfo.getPassword());

6
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginAppsMapper.xml
View File

@ -15,8 +15,8 @@
<if test="appName != null and appName != ''">
and appname like concat('%',#{appName},'%')
</if>
<if test="uid != null and uid != ''">
and uid = #{uid}
<if test="userId != null and userId != ''">
and userId = #{userId}
</if>
<if test="username != null and username != ''">
and username like concat('%',#{username},'%')
@ -39,7 +39,7 @@
sessionid,
appid,
appname,
uid,
userId,
username,
displayname,
to_char(logintime,'YYYY-MM-DD HH24:MI:SS') as logintime

6
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/HistoryLoginMapper.xml
View File

@ -6,8 +6,8 @@
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="uid != null and uid != ''">
and uid = #{uid}
<if test="userId != null and userId != ''">
and userId = #{userId}
</if>
<if test="username != null and username != '' ">
and lower(username) like lower(concat('%',#{username},'%'))
@ -42,7 +42,7 @@
select
id,
sessionid,
uid,
userId,
username,
displayname,
logintype,

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

@ -15,8 +15,8 @@
<if test="appName != null and appName != ''">
and appname like concat('%',#{appName},'%')
</if>
<if test="uid != null and uid != ''">
and uid = #{uid}
<if test="userId != null and userId != ''">
and userId = #{userId}
</if>
<if test="username != null and username != ''">
and username = #{username}
@ -39,7 +39,7 @@
sessionid,
appid,
appname,
uid,
userId,
username,
displayname,
date_format(logintime, '%Y-%m-%d %H:%i:%s') as logintime

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

@ -6,8 +6,8 @@
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="uid != null and uid != ''">
and uid = #{uid}
<if test="userId != null and userId != ''">
and userId = #{userId}
</if>
<if test="username != null and username != '' ">
and lower(username) like lower(concat('%',#{username},'%'))
@ -42,7 +42,7 @@
select
id,
sessionid,
uid,
userId,
username,
displayname,
logintype,
@ -68,7 +68,7 @@
select
sessionid id,
sessionid,
uid,
userId,
username,
displayname,
logintype,

4
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginAppsMapper.xml
View File

@ -15,8 +15,8 @@
<if test="appName != null and appName != ''">
and appname like concat('%',#{appName},'%')
</if>
<if test="uid != null and uid != ''">
and uid = #{uid}
<if test="userId != null and userId != ''">
and userId = #{userId}
</if>
<if test="username != null and username != ''">
and username like concat('%',#{username},'%')

6
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/HistoryLoginMapper.xml
View File

@ -6,8 +6,8 @@
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="uid != null and uid != ''">
and uid = #{uid}
<if test="userId != null and userId != ''">
and userId = #{userId}
</if>
<if test="username != null and username != '' ">
and lower(username) like lower(concat('%',#{username},'%'))
@ -42,7 +42,7 @@
select
id,
sessionid,
uid,
userId,
username,
displayname,
logintype,

2
maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java
View File

@ -89,7 +89,7 @@ public class AuthorizeBaseEndpoint {
}else if(application.getCredential()==Apps.CREDENTIALS.SYSTEM){
if(application.getSystemUserAttr().equalsIgnoreCase("uid")){
if(application.getSystemUserAttr().equalsIgnoreCase("userId")){
account.setUsername(userInfo.getId());
}else if(application.getSystemUserAttr().equalsIgnoreCase("username")){
account.setUsername(userInfo.getUsername());

6
maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java
View File

@ -47,7 +47,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{
modelAndView.addObject("username", "");
modelAndView.addObject("password", "");
modelAndView.addObject("setpassword", true);
modelAndView.addObject("uid", WebContext.getUserInfo().getId());
modelAndView.addObject("userId", WebContext.getUserInfo().getId());
modelAndView.addObject("appId", appId);
modelAndView.addObject("appName",getApp(appId).getName());
modelAndView.addObject("redirect_uri", redirect_uri);
@ -57,7 +57,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{
@RequestMapping("/authz/credential")
public ModelAndView authorizeCredential(
HttpServletRequest request,
@RequestParam("uid") String uid,
@RequestParam("userId") String userId,
@RequestParam("appId") String appId,
@RequestParam("identity_username") String identity_username,
@RequestParam("identity_password") String identity_password,
@ -68,7 +68,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{
UserInfo userInfo=WebContext.getUserInfo();
appUser.setId(appUser.generateId());
appUser.setUid(userInfo.getId());
appUser.setUserId(userInfo.getId());
appUser.setUsername(userInfo.getUsername());
appUser.setDisplayName(userInfo.getDisplayName());

2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java
View File

@ -200,7 +200,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{
ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder();
serviceResponseBuilder.setFormat(HttpResponseConstants.FORMAT_TYPE.JSON);
//for user
serviceResponseBuilder.setAttribute("uid", userInfo.getId());
serviceResponseBuilder.setAttribute("userId", userInfo.getId());
serviceResponseBuilder.setAttribute("displayName",userInfo.getDisplayName());
serviceResponseBuilder.setAttribute("firstName", userInfo.getGivenName());
serviceResponseBuilder.setAttribute("lastname", userInfo.getFamilyName());

2
maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java
View File

@ -63,7 +63,7 @@ public class ExtendApiAuthorizeEndpoint extends AuthorizeBaseEndpoint{
String username ="";
String password ="";
if(apps.getCredential()==1) {
if(apps.getSystemUserAttr().equalsIgnoreCase("uid")) {
if(apps.getSystemUserAttr().equalsIgnoreCase("userId")) {
username = userInfo.getId();
}else if(apps.getSystemUserAttr().equalsIgnoreCase("username")) {
username = userInfo.getUsername();

2
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java
View File

@ -33,7 +33,7 @@ public class OAuthDefaultUserInfoAdapter extends AbstractAuthorizeAdapter {
public String generateInfo(SigninPrincipal authentication,UserInfo userInfo,Object app) {
HashMap<String, Object> beanMap = new HashMap<String, Object>();
beanMap.put("randomId",(new StringGenerator()).uuidGenerate());
beanMap.put("uid", userInfo.getId());
beanMap.put("userId", userInfo.getId());
//for spring security oauth2
beanMap.put("user", userInfo.getUsername());
beanMap.put("username", userInfo.getUsername());

6
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java
View File

@ -271,9 +271,9 @@ public class OpenIdConnectUserInfoEndpoint {
return atfe;
}
public UserInfo queryUserInfo(String uid){
_logger.debug("uid : "+uid);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(uid);
public UserInfo queryUserInfo(String userId){
_logger.debug("userId : "+userId);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(userId);
return userInfo;
}

6
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java
View File

@ -157,9 +157,9 @@ public class UserInfoEndpoint {
return atfe;
}
public UserInfo queryUserInfo(String uid){
_logger.debug("uid : "+uid);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(uid);
public UserInfo queryUserInfo(String userId){
_logger.debug("userId : "+userId);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(userId);
return userInfo;
}

4
maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java
View File

@ -42,8 +42,8 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter {
beanMap.put("randomId",(new StringGenerator()).uuidGenerate());
if(details.getUserPropertys()!=null && !details.getUserPropertys().equals("")) {
if(details.getUserPropertys().indexOf("uid")>-1){
beanMap.put("uid",userInfo.getId());
if(details.getUserPropertys().indexOf("userId")>-1){
beanMap.put("userId",userInfo.getId());
}
if(details.getUserPropertys().indexOf("username")>-1){

2
maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java
View File

@ -37,7 +37,7 @@ public class TokenBasedSimpleAdapter extends AbstractAuthorizeAdapter {
String tokenUsername = userInfo.getUsername();
if(details.getUserPropertys()!=null && !details.getUserPropertys().equals("")) {
if(details.getUserPropertys().indexOf("uid")>-1){
if(details.getUserPropertys().indexOf("userId")>-1){
tokenUsername=userInfo.getId();
}else if(details.getUserPropertys().indexOf("username")>-1){
tokenUsername= userInfo.getUsername();

8
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java
View File

@ -120,7 +120,7 @@ public class AppListController {
} else {
modelAndView.addObject("protectedappId", false);
}
modelAndView.addObject("uid", userInfo.getId());
modelAndView.addObject("userId", userInfo.getId());
modelAndView.addObject("appId", appId);
modelAndView.addObject("protocol", protocol);
modelAndView.addObject("credential", credential);
@ -223,7 +223,7 @@ public class AppListController {
modelAndView.addObject("password", false);
}
modelAndView.addObject("uid", userInfo.getId());
modelAndView.addObject("userId", userInfo.getId());
modelAndView.addObject("appId", appId);
modelAndView.addObject("protocol", protocol);
modelAndView.addObject("credential", credential);
@ -242,7 +242,7 @@ public class AppListController {
Accounts appUsers = new Accounts();
appUsers.setAppId(appId);
appUsers.setUid(userInfo.getId());
appUsers.setUserId(userInfo.getId());
if (identity_password != null && !identity_password.equals("") && credential == Apps.CREDENTIALS.USER_DEFINED) {
appUsers = appUsersService.load(new Accounts(userInfo.getId(), appId));
@ -251,7 +251,7 @@ public class AppListController {
appUsers.setId(appUsers.generateId());
appUsers.setAppId(appId);
appUsers.setAppName(app.getName());
appUsers.setUid(userInfo.getId());
appUsers.setUserId(userInfo.getId());
appUsers.setUsername(userInfo.getUsername());
appUsers.setDisplayName(userInfo.getDisplayName());

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java
View File

@ -58,7 +58,7 @@ public class SocialSignOnListController {
List<SocialSignOnProvider> listSocialSignOnProvider= socialSignOnProviderService.getSocialSignOnProviders();
SocialsAssociate socialSignOnUser=new SocialsAssociate();
socialSignOnUser.setUid(WebContext.getUserInfo().getId());
socialSignOnUser.setUserId(WebContext.getUserInfo().getId());
List<SocialsAssociate> listSocialSignOnUserToken= socialSignOnUserService.query(socialSignOnUser);
List<SocialSignOnProvider> listBindSocialSignOnProvider=new ArrayList<SocialSignOnProvider>();
_logger.debug("list SocialSignOnProvider : "+listSocialSignOnProvider);

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/HistoryLoginController.java
View File

@ -69,7 +69,7 @@ public class HistoryLoginController {
@ResponseBody
public JpaPageResults<HistoryLogin> logAuthsGrid(@ModelAttribute("historyLogin") HistoryLogin historyLogin) {
_logger.debug("history/login/grid/ logsGrid() " + historyLogin);
historyLogin.setUid(WebContext.getUserInfo().getId());
historyLogin.setUserId(WebContext.getUserInfo().getId());
return historyLoginService.queryPageResults(historyLogin);
}

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java
View File

@ -89,7 +89,7 @@ public class LoginSessionController {
@ResponseBody
public JpaPageResults<HistoryLogin> loginSessionListGrid(@ModelAttribute("historyLogin") HistoryLogin historyLogin) {
_logger.debug("history/loginsession/ loginSessionListGrid() " + historyLogin);
historyLogin.setUid(WebContext.getUserInfo().getId());
historyLogin.setUserId(WebContext.getUserInfo().getId());
return historyLoginService.queryOnlineSession(historyLogin);
}

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java
View File

@ -91,7 +91,7 @@ public class HistoryLoginAppAdapter implements AsyncHandlerInterceptor {
historyLoginApps.setAppId(app.getId());
historyLoginApps.setSessionId(sessionId);
historyLoginApps.setAppName(app.getName());
historyLoginApps.setUid(userInfo.getId());
historyLoginApps.setUserId(userInfo.getId());
historyLoginApps.setUsername(userInfo.getUsername());
historyLoginApps.setDisplayName(userInfo.getDisplayName());
historyLoginAppsService.insert(historyLoginApps);

2
maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
View File

@ -22,5 +22,5 @@ application.formatted-version=v2.9.0 GA
############################################################################
#spring.profiles.active https/http; default https #
############################################################################
spring.profiles.active=http
spring.profiles.active=https

4
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl
View File

@ -22,8 +22,8 @@
<td><input required="" class="form-control" type="password" id="identity_password" name="identity_password" value="" /></td>
</tr>
<tr style="display:none">
<td>uid</td>
<td><input type="text" id="uid" name="uid" value="${uid}" /></td>
<td>userId</td>
<td><input type="text" id="userId" name="userId" value="${userId}" /></td>
</tr>
<tr style="display:none">
<td>appId</td>

6
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl
View File

@ -77,9 +77,9 @@
<th data-field="logoutTime"><@locale code="log.loginhistory.logoutTime"/></th>
<th data-field="platform"><@locale code="log.loginhistory.platform"/></th>
<th data-field="application"><@locale code="log.loginhistory.application"/></th>
<th data-field="loginUrl"><@locale code="log.loginhistory.loginUrl"/></th>
<th data-field="code"><@locale code="log.loginhistory.code"/></th>
<th data-field="rpUserInfo"><@locale code="log.loginhistory.rpUserInfo"/></th>
<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
<th data-field="code" data-visible="false"><@locale code="log.loginhistory.code"/></th>
<th data-field="rpUserInfo" data-visible="false"><@locale code="log.loginhistory.rpUserInfo"/></th>
</tr>
</thead>

2
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl
View File

@ -32,7 +32,7 @@
<tr style="display:none">
<td>uid</td>
<td><input class="form-control" type="text" id="uid" name="uid" value="${uid}" /></td>
<td><input class="form-control" type="text" id="userId" name="userId" value="${userId}" /></td>
</tr>
<tr style="display:none">
<td>appId</td>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
View File

@ -71,7 +71,7 @@
<td colspan="2" class="center">
<input id="_method" type="hidden" name="_method" value="post"/>
<input id="status" type="hidden" name="status" value="1"/>
<input type="hidden" id="uid" name="uid" class="uid" title="" value="${model.uid!}"/>
<input type="hidden" id="userId" name="userId" class="userId" title="" value="${model.userId!}"/>
<input type="hidden" id="appId" name="appId" class="appId" title="" value="${model.appId!}"/>
<input class="button btn btn-primary mr-3" type="submit" id="submitBtn" value="<@locale code="button.text.save" />"/>
<input class="button btn btn-secondary mr-3" type="button" id="closeBtn" value="<@locale code="button.text.cancel" /> "/>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl
View File

@ -93,7 +93,7 @@ $(function(){
<th><@locale code="apps.systemUserAttr"/>：</th>
<td colspan="3">
<select id="systemUserAttr" name="systemUserAttr" class="form-control" >
<option value="uid">
<option value="userId">
<@locale code="userinfo.id"/></option>
<option value="employeeNumber">
<@locale code="userinfo.employeeNumber"/></option>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
View File

@ -96,7 +96,7 @@ $(function(){
<th><@locale code="apps.systemUserAttr"/>：</th>
<td colspan="3">
<select id="systemUserAttr" name="systemUserAttr" class="form-control">
<option value="uid" <#if 'uid'==model.systemUserAttr>selected</#if> >
<option value="userId" <#if 'userId'==model.systemUserAttr>selected</#if> >
<@locale code="userinfo.id"/></option>
<option value="employeeNumber" <#if 'employeeNumber'==model.systemUserAttr>selected</#if> >
<@locale code="userinfo.employeeNumber"/></option>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/userPropertys.ftl
View File

@ -1,5 +1,5 @@
<select id="userPropertys" name="userPropertys" class="form-control multipleselect" multiple="multiple" >
<option value="uid" <#if model.userPropertys?contains("uid")>selected</#if> >
<option value="userId" <#if model.userPropertys?contains("userId")>selected</#if> >
<@locale code="userinfo.id" />
</option>
<option value="username" <#if model.userPropertys?contains("username")>selected</#if> >

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginAppsHistoryList.ftl
View File

@ -110,7 +110,7 @@
<tr>
<th data-sortable="true" data-field="id" data-visible="false"><@locale code="log.loginappshistory.id" /></th>
<th data-field="sessionId" ><@locale code="log.loginappshistory.sessionId" /></th>
<th data-field="uid" data-visible="false"><@locale code="log.loginappshistory.uid" /></th>
<th data-field="userId" data-visible="false"><@locale code="log.loginappshistory.uid" /></th>
<th data-field="username" ><@locale code="log.loginappshistory.username" /></th>
<th data-field="displayName" ><@locale code="log.loginappshistory.displayName" /></th>
<th data-field="appId" data-visible="false"><@locale code="log.loginappshistory.appId" /></th>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoSelect.ftl
View File

@ -32,7 +32,7 @@
console.log(seldata[0].id+" - "+seldata[0].fullName);
$(".username", window.parent.document).val(seldata[0].username);
$(".displayName", window.parent.document).val(seldata[0].displayName);
$(".uid", window.parent.document).val(seldata[0].id);
$(".userId", window.parent.document).val(seldata[0].id);
$.closeWindow();
});

4
settings.gradle
View File

@ -42,3 +42,7 @@ include 'maxkey-webs:maxkey-web-resources'
include 'maxkey-webs:maxkey-web-maxkey'
//maxkey-mgt management
include 'maxkey-webs:maxkey-web-mgt'
//maxkey-boot-monitor
include 'maxkey-webs:maxkey-boot-monitor'
include 'maxkey-gataway'

57
sql/maxkey_v2.9.0.GA.sql
View File

@ -24,14 +24,14 @@ DROP TABLE IF EXISTS `mxk_accounts`;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `mxk_accounts` (
`ID` varchar(45) NOT NULL COMMENT '主键',
`UID` varchar(45) DEFAULT NULL COMMENT '用户ID',
`USERID` varchar(45) DEFAULT NULL COMMENT '用户ID',
`USERNAME` varchar(45) DEFAULT NULL COMMENT '用户名',
`DISPLAYNAME` varchar(45) DEFAULT NULL COMMENT '用户显示名',
`APPID` varchar(45) DEFAULT NULL COMMENT '应用ID',
`APPNAME` varchar(100) DEFAULT NULL COMMENT '应用名称',
`RELATEDUSERNAME` varchar(200) DEFAULT NULL COMMENT '用户名',
`RELATEDPASSWORD` varchar(200) DEFAULT NULL COMMENT '密码',
`MODIFIEDDATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`APPNAME` varchar(100) DEFAULT NULL COMMENT '应用名称',
`USERNAME` varchar(45) DEFAULT NULL COMMENT '用户名',
`DISPLAYNAME` varchar(45) DEFAULT NULL COMMENT '用户显示名',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户账号表';
/*!40101 SET character_set_client = @saved_cs_client */;
@ -321,6 +321,23 @@ CREATE TABLE `mxk_history_connector` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `mxk_history_event`
--
DROP TABLE IF EXISTS `mxk_history_event`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `mxk_history_event` (
`id` bigint NOT NULL AUTO_INCREMENT,
`eventname` varchar(45) DEFAULT NULL,
`datatype` varchar(45) DEFAULT NULL,
`datacount` int DEFAULT NULL,
`executedatetime` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `mxk_history_login`
--
@ -330,21 +347,22 @@ DROP TABLE IF EXISTS `mxk_history_login`;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `mxk_history_login` (
`ID` varchar(45) NOT NULL COMMENT 'ID',
`SESSIONID` varchar(45) DEFAULT NULL COMMENT 'SESSIONID',
`USERID` varchar(45) NOT NULL COMMENT 'USERID',
`USERNAME` varchar(200) NOT NULL COMMENT 'USERNAME',
`DISPLAYNAME` varchar(45) DEFAULT NULL COMMENT 'DISPLAYNAME',
`MESSAGE` varchar(200) DEFAULT NULL COMMENT 'MESSAGE',
`SOURCEIP` varchar(45) DEFAULT NULL COMMENT 'LOGIN SOURCEIP ',
`LOGINTIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'LOGINTIME',
`LOGINTYPE` varchar(45) DEFAULT NULL COMMENT 'LOGINTYPE',
`UID` varchar(45) NOT NULL COMMENT 'UID',
`CODE` varchar(45) DEFAULT NULL COMMENT 'CODE',
`PROVIDER` varchar(45) DEFAULT NULL COMMENT 'PROVIDER',
`SESSIONID` varchar(45) DEFAULT NULL COMMENT 'SESSIONID',
`BROWSER` varchar(45) DEFAULT NULL COMMENT 'BROWSER',
`PLATFORM` varchar(45) DEFAULT NULL COMMENT 'PLATFORM',
`APPLICATION` varchar(45) DEFAULT NULL COMMENT 'APPLICATION',
`LOGINURL` varchar(450) DEFAULT NULL COMMENT 'LOGINURL',
`LOGOUTTIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'LOGOUTTIME',
`LOGINTIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'LOGINTIME',
`LOGOUTTIME` varchar(50) NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'LOGOUTTIME',
`SESSIONSTATUS` int DEFAULT '1',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='history_login';
/*!40101 SET character_set_client = @saved_cs_client */;
@ -362,7 +380,7 @@ CREATE TABLE `mxk_history_login_apps` (
`LOGINTIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'LOGINTIME',
`APPID` varchar(45) NOT NULL COMMENT 'ACCESS APPID',
`APPNAME` varchar(45) DEFAULT NULL COMMENT 'APPNAME',
`UID` varchar(45) DEFAULT NULL COMMENT 'UID',
`USERID` varchar(45) DEFAULT NULL COMMENT 'USERID',
`USERNAME` varchar(45) DEFAULT NULL COMMENT 'USERNAME',
`DISPLAYNAME` varchar(45) DEFAULT NULL COMMENT 'DISPLAYNAME',
PRIMARY KEY (`ID`)
@ -402,12 +420,12 @@ DROP TABLE IF EXISTS `mxk_history_synchronizer`;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `mxk_history_synchronizer` (
`ID` varchar(45) NOT NULL COMMENT 'ID',
`SYNCID` varchar(45) NOT NULL COMMENT 'ACCESS APPID',
`SYNCNAME` varchar(45) DEFAULT NULL COMMENT 'APPNAME',
`OBJECTID` varchar(45) DEFAULT NULL COMMENT 'UID',
`OBJECTNAME` varchar(45) DEFAULT NULL COMMENT 'USERNAME',
`OBJECTTYPE` varchar(45) DEFAULT NULL COMMENT 'DISPLAYNAME',
`SYNCTIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'LOGINTIME',
`SYNCID` varchar(45) NOT NULL COMMENT 'SYNCID',
`SYNCNAME` varchar(45) DEFAULT NULL COMMENT 'SYNCNAME',
`OBJECTID` varchar(45) DEFAULT NULL COMMENT 'OBJECTID',
`OBJECTNAME` varchar(45) DEFAULT NULL COMMENT 'OBJECTNAME',
`OBJECTTYPE` varchar(45) DEFAULT NULL COMMENT 'OBJECTTYPE',
`SYNCTIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'SYNCTIME',
`RESULT` varchar(45) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='synchronizer logs';
@ -605,15 +623,16 @@ DROP TABLE IF EXISTS `mxk_socials_associate`;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `mxk_socials_associate` (
`ID` varchar(45) NOT NULL,
`UID` varchar(45) NOT NULL COMMENT 'UID',
`USERID` varchar(45) NOT NULL COMMENT 'USERID',
`USERNAME` varchar(45) NOT NULL DEFAULT 'automatic',
`PROVIDER` varchar(45) NOT NULL COMMENT 'PROVIDER',
`SOCIALUSERINFO` text COMMENT 'SOCIALUSERINFO',
`SOCIALUID` varchar(100) NOT NULL COMMENT 'SOCIALUID',
`SOCIALUSERID` varchar(100) NOT NULL COMMENT 'SOCIALUSERID',
`EXATTRIBUTE` text,
`ACCESSTOKEN` text,
`CREATEDDATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`UPDATEDDATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`USERNAME` varchar(45) NOT NULL,
`TRANSMISSION` varchar(45) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='socialsignon USER BIND';
/*!40101 SET character_set_client = @saved_cs_client */;
@ -819,4 +838,4 @@ CREATE TABLE `mxk_userinfo_adjunct` (
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2021-08-09 22:41:07
-- Dump completed on 2021-08-20 9:07:27

37
sql/maxkey_v2.9.0.GA_data.sql
View File

File diff suppressed because one or more lines are too long