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

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