lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-07-15 23:13:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #198 from fanchw/dev

Browse Source 
将SaOAuth2Template类中converXxx相关方法名称改为convertXxx
This commit is contained in:
click33 2021-12-23 01:26:31 +08:00 committed by GitHub
commit ebec86f0de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
View File

@ -149,8 +149,8 @@ public class SaOAuth2Template {
deleteRefreshToken(getRefreshTokenValue(cm.clientId, cm.loginId)); deleteRefreshToken(getRefreshTokenValue(cm.clientId, cm.loginId));
// 3、生成token // 3、生成token
AccessTokenModel at = converCodeToAccessToken(cm); AccessTokenModel at = convertCodeToAccessToken(cm);
RefreshTokenModel rt = converAccessTokenToRefreshToken(at); RefreshTokenModel rt = convertAccessTokenToRefreshToken(at);
at.refreshToken = rt.refreshToken; at.refreshToken = rt.refreshToken;
at.refreshExpiresTime = rt.expiresTime; at.refreshExpiresTime = rt.expiresTime;
@ -184,7 +184,7 @@ public class SaOAuth2Template {
deleteRefreshToken(rt.refreshToken); deleteRefreshToken(rt.refreshToken);
// 创建并保持新的 Refresh-Token // 创建并保持新的 Refresh-Token
rt = converRefreshTokenToRefreshToken(rt); rt = convertRefreshTokenToRefreshToken(rt);
saveRefreshToken(rt); saveRefreshToken(rt);
saveRefreshTokenIndex(rt); saveRefreshTokenIndex(rt);
} }
@ -193,7 +193,7 @@ public class SaOAuth2Template {
deleteAccessToken(getAccessTokenValue(rt.clientId, rt.loginId)); deleteAccessToken(getAccessTokenValue(rt.clientId, rt.loginId));
// 生成新 Access-Token // 生成新 Access-Token
AccessTokenModel at = converRefreshTokenToAccessToken(rt); AccessTokenModel at = convertRefreshTokenToAccessToken(rt);
// 保存新 Access-Token // 保存新 Access-Token
saveAccessToken(at); saveAccessToken(at);
@ -224,7 +224,7 @@ public class SaOAuth2Template {
// 3、生成&保存 Refresh-Token // 3、生成&保存 Refresh-Token
if(isCreateRt) { if(isCreateRt) {
RefreshTokenModel rt = converAccessTokenToRefreshToken(at); RefreshTokenModel rt = convertAccessTokenToRefreshToken(at);
saveRefreshToken(rt); saveRefreshToken(rt);
saveRefreshTokenIndex(rt); saveRefreshTokenIndex(rt);
} }
@ -436,13 +436,13 @@ public class SaOAuth2Template {
return at; return at;
} }
// ------------------- conver 数据转换 // ------------------- convert 数据转换
/** /**
* 将 Code 转换为 Access-Token * 将 Code 转换为 Access-Token
* @param cm CodeModel对象 * @param cm CodeModel对象
* @return AccessToken对象 * @return AccessToken对象
*/ */
public AccessTokenModel converCodeToAccessToken(CodeModel cm) { public AccessTokenModel convertCodeToAccessToken(CodeModel cm) {
AccessTokenModel at = new AccessTokenModel(); AccessTokenModel at = new AccessTokenModel();
at.accessToken = randomAccessToken(cm.clientId, cm.loginId, cm.scope); at.accessToken = randomAccessToken(cm.clientId, cm.loginId, cm.scope);
// at.refreshToken = randomRefreshToken(cm.clientId, cm.loginId, cm.scope); // at.refreshToken = randomRefreshToken(cm.clientId, cm.loginId, cm.scope);
@ -459,7 +459,7 @@ public class SaOAuth2Template {
* @param at . * @param at .
* @return . * @return .
*/ */
public RefreshTokenModel converAccessTokenToRefreshToken(AccessTokenModel at) { public RefreshTokenModel convertAccessTokenToRefreshToken(AccessTokenModel at) {
RefreshTokenModel rt = new RefreshTokenModel(); RefreshTokenModel rt = new RefreshTokenModel();
rt.refreshToken = randomRefreshToken(at.clientId, at.loginId, at.scope); rt.refreshToken = randomRefreshToken(at.clientId, at.loginId, at.scope);
rt.clientId = at.clientId; rt.clientId = at.clientId;
@ -477,7 +477,7 @@ public class SaOAuth2Template {
* @param rt . * @param rt .
* @return . * @return .
*/ */
public AccessTokenModel converRefreshTokenToAccessToken(RefreshTokenModel rt) { public AccessTokenModel convertRefreshTokenToAccessToken(RefreshTokenModel rt) {
AccessTokenModel at = new AccessTokenModel(); AccessTokenModel at = new AccessTokenModel();
at.accessToken = randomAccessToken(rt.clientId, rt.loginId, rt.scope); at.accessToken = randomAccessToken(rt.clientId, rt.loginId, rt.scope);
at.refreshToken = rt.refreshToken; at.refreshToken = rt.refreshToken;
@ -494,7 +494,7 @@ public class SaOAuth2Template {
* @param rt . * @param rt .
* @return . * @return .
*/ */
public RefreshTokenModel converRefreshTokenToRefreshToken(RefreshTokenModel rt) { public RefreshTokenModel convertRefreshTokenToRefreshToken(RefreshTokenModel rt) {
RefreshTokenModel newRt = new RefreshTokenModel(); RefreshTokenModel newRt = new RefreshTokenModel();
newRt.refreshToken = randomRefreshToken(rt.clientId, rt.loginId, rt.scope); newRt.refreshToken = randomRefreshToken(rt.clientId, rt.loginId, rt.scope);
newRt.expiresTime = System.currentTimeMillis() + (SaOAuth2Manager.getConfig().getRefreshTokenTimeout() * 1000); newRt.expiresTime = System.currentTimeMillis() + (SaOAuth2Manager.getConfig().getRefreshTokenTimeout() * 1000);