From 2bb9a16cbba80d94c4b00764ba9d94e93df7a228 Mon Sep 17 00:00:00 2001 From: "shengzhaoli.shengz" <monkeyk1987@gmail.com> Date: Sat, 14 Oct 2023 21:26:40 +0800 Subject: [PATCH] row mapper --- .../jdbc/OauthClientDetailsRowMapper.java | 33 +++++++++++-------- .../infrastructure/jdbc/UserRowMapper.java | 1 + 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthClientDetailsRowMapper.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthClientDetailsRowMapper.java index d09905e..82ea384 100644 --- a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthClientDetailsRowMapper.java +++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/OauthClientDetailsRowMapper.java @@ -16,9 +16,10 @@ import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; import java.sql.SQLException; -import java.time.ZoneId; +import java.sql.Timestamp; /** + * table: oauth2_registered_client * 2015/11/16 * * @author Shengzhao Li @@ -33,24 +34,28 @@ public class OauthClientDetailsRowMapper implements RowMapper<OauthClientDetails public OauthClientDetails mapRow(ResultSet rs, int i) throws SQLException { OauthClientDetails clientDetails = new OauthClientDetails(); + clientDetails.id(rs.getString("id")); + clientDetails.archived(rs.getBoolean("archived")); + clientDetails.createTime(rs.getTimestamp("create_time").toLocalDateTime()); clientDetails.clientId(rs.getString("client_id")); -// clientDetails.resourceIds(rs.getString("resource_ids")); + clientDetails.clientIdIssuedAt(rs.getTimestamp("client_id_issued_at").toInstant()); + clientDetails.clientName(rs.getString("client_name")); + + clientDetails.clientAuthenticationMethods(rs.getString("client_authentication_methods")); clientDetails.clientSecret(rs.getString("client_secret")); -// clientDetails.scope(rs.getString("scope")); -// clientDetails.authorizedGrantTypes(rs.getString("authorized_grant_types")); -// clientDetails.webServerRedirectUri(rs.getString("web_server_redirect_uri")); + clientDetails.scopes(rs.getString("scopes")); + clientDetails.authorizationGrantTypes(rs.getString("authorization_grant_types")); + clientDetails.redirectUris(rs.getString("redirect_uris")); -// clientDetails.authorities(rs.getString("authorities")); -// clientDetails.accessTokenValidity(getInteger(rs, "access_token_validity")); -// clientDetails.refreshTokenValidity(getInteger(rs, "refresh_token_validity")); + clientDetails.postLogoutRedirectUris(rs.getString("post_logout_redirect_uris")); + clientDetails.clientSettings(rs.getString("client_settings")); + clientDetails.tokenSettings(rs.getString("token_settings")); -// clientDetails.additionalInformation(rs.getString("additional_information")); - clientDetails.createTime(rs.getTimestamp("create_time").toLocalDateTime()); - clientDetails.archived(rs.getBoolean("archived")); - -// clientDetails.trusted(rs.getBoolean("trusted")); -// clientDetails.autoApprove(rs.getString("autoapprove")); + Timestamp secretExpiresAt = rs.getTimestamp("client_secret_expires_at"); + if (secretExpiresAt != null) { + clientDetails.clientSecretExpiresAt(secretExpiresAt.toInstant()); + } return clientDetails; } diff --git a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRowMapper.java b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRowMapper.java index 4b60427..83defd6 100644 --- a/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRowMapper.java +++ b/src/main/java/com/monkeyk/sos/infrastructure/jdbc/UserRowMapper.java @@ -18,6 +18,7 @@ import java.sql.ResultSet; import java.sql.SQLException; /** + * table: user_ * 2015/11/16 * * @author Shengzhao Li