From 47cf8939cba08c378e8dcb3bb9bf3e592ba3aaea Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Wed, 14 Aug 2024 13:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20sa-token-oauth2=20?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=9B=B8=E5=85=B3=E5=8C=85=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/dev33/satoken/session/SaSession.java | 16 +- .../com/pj/oauth2/SaOAuth2DataLoaderImpl.java | 7 +- .../data/loader/SaOAuth2DataLoader.java | 2 +- .../{ => data}/model/AccessTokenModel.java | 2 +- .../{ => data}/model/ClientTokenModel.java | 192 +++++++++--------- .../oauth2/{ => data}/model/CodeModel.java | 2 +- .../{ => data}/model/RefreshTokenModel.java | 150 +++++++------- .../{ => data}/model/RequestAuthModel.java | 2 +- .../{ => data}/model/SaClientModel.java | 2 +- .../data/resolver/SaOAuth2DataResolver.java | 4 +- .../SaOAuth2DataResolverDefaultImpl.java | 4 +- .../processor/SaOAuth2ServerProcessor.java | 2 +- .../oauth2/template/SaOAuth2Template.java | 2 +- .../satoken/oauth2/template/SaOAuth2Util.java | 2 +- 14 files changed, 202 insertions(+), 187 deletions(-) rename sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/{ => data}/model/AccessTokenModel.java (98%) rename sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/{ => data}/model/ClientTokenModel.java (94%) rename sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/{ => data}/model/CodeModel.java (98%) rename sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/{ => data}/model/RefreshTokenModel.java (93%) rename sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/{ => data}/model/RequestAuthModel.java (98%) rename sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/{ => data}/model/SaClientModel.java (99%) diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java index 83d8bc2e..8e7f3e6f 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java @@ -96,7 +96,7 @@ public class SaSession implements SaSetValueInterface, Serializable { /** * 所有挂载数据 */ - private final Map dataMap = new ConcurrentHashMap<>(); + private Map dataMap = new ConcurrentHashMap<>(); // ----------------------- 构建相关 @@ -522,14 +522,26 @@ public class SaSession implements SaSetValueInterface, Serializable { return dataMap; } + /** + * 设置数据挂载集合 (改变底层对象引用，将 dataMap 整个对象替换) + * @param dataMap 数据集合 + * + * @return 对象自身 + */ + public SaSession setDataMap(Map dataMap) { + this.dataMap = dataMap; + return this; + } + /** * 写入数据集合 (不改变底层对象引用，只将此 dataMap 所有数据进行替换) * @param dataMap 数据集合 */ - public void refreshDataMap(Map dataMap) { + public SaSession refreshDataMap(Map dataMap) { this.dataMap.clear(); this.dataMap.putAll(dataMap); this.update(); + return this; } // diff --git a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2DataLoaderImpl.java b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2DataLoaderImpl.java index 4aa10f07..626381f3 100644 --- a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2DataLoaderImpl.java +++ b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2DataLoaderImpl.java @@ -1,7 +1,8 @@ package com.pj.oauth2; import cn.dev33.satoken.oauth2.data.loader.SaOAuth2DataLoader; -import cn.dev33.satoken.oauth2.model.SaClientModel; +import cn.dev33.satoken.oauth2.data.model.SaClientModel; +import cn.dev33.satoken.secure.SaSecureUtil; import org.springframework.stereotype.Component; /** @@ -31,7 +32,9 @@ public class SaOAuth2DataLoaderImpl implements SaOAuth2DataLoader { @Override public String getOpenid(String clientId, Object loginId) { // 此为模拟数据，真实环境需要从数据库查询 - return "gr_SwoIN0MC1ewxHX_vfCW3BothWDZMMtx__"; +// return "gr_SwoIN0MC1ewxHX_vfCW3BothWDZMMtx__"; + String prefix = "grSwoIN0MC1ewxHXvfCW3BothWDZMMtx"; + return SaSecureUtil.md5(prefix + "_" + clientId + "_" + loginId); } } diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/loader/SaOAuth2DataLoader.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/loader/SaOAuth2DataLoader.java index ab890941..c9c5f75e 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/loader/SaOAuth2DataLoader.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/loader/SaOAuth2DataLoader.java @@ -15,7 +15,7 @@ */ package cn.dev33.satoken.oauth2.data.loader; -import cn.dev33.satoken.oauth2.model.SaClientModel; +import cn.dev33.satoken.oauth2.data.model.SaClientModel; /** * Sa-Token OAuth2 数据加载器 diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/AccessTokenModel.java similarity index 98% rename from sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java rename to sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/AccessTokenModel.java index 13e1726f..5ae94487 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/AccessTokenModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.dev33.satoken.oauth2.model; +package cn.dev33.satoken.oauth2.data.model; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/ClientTokenModel.java similarity index 94% rename from sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java rename to sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/ClientTokenModel.java index a24a83a9..012e7556 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/ClientTokenModel.java @@ -1,96 +1,96 @@ -/* - * Copyright 2020-2099 sa-token.cc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.dev33.satoken.oauth2.model; - -import java.io.Serializable; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * Model: Client-Token - * - * @author click33 - * @since 1.23.0 - */ -public class ClientTokenModel implements Serializable { - - private static final long serialVersionUID = -6541180061782004705L; - - /** - * Client-Token 值 - */ - public String clientToken; - - /** - * Client-Token 到期时间 - */ - public long expiresTime; - - /** - * 应用id - */ - public String clientId; - - /** - * 授权范围 - */ - public String scope; - - public ClientTokenModel() {} - - /** - * 构建一个 - * @param accessToken accessToken - * @param clientId 应用id - * @param scope 请求授权范围 - */ - public ClientTokenModel(String accessToken, String clientId, String scope) { - super(); - this.clientToken = accessToken; - this.clientId = clientId; - this.scope = scope; - } - - @Override - public String toString() { - return "ClientTokenModel [clientToken=" + clientToken + ", expiresTime=" + expiresTime + ", clientId=" - + clientId + ", scope=" + scope + "]"; - } - - /** - * 获取：此 Client-Token 的剩余有效期（秒） - * @return see note - */ - public long getExpiresIn() { - long s = (expiresTime - System.currentTimeMillis()) / 1000; - return s < 1 ? -2 : s; - } - - /** - * 将所有属性转换为下划线形式的Map - * @return 属性转Map - */ - public Map toLineMap() { - Map map = new LinkedHashMap<>(); - map.put("client_token", clientToken); - map.put("expires_in", getExpiresIn()); - map.put("client_id", clientId); - map.put("scope", scope); - return map; - } - - -} +/* + * Copyright 2020-2099 sa-token.cc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.dev33.satoken.oauth2.data.model; + +import java.io.Serializable; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * Model: Client-Token + * + * @author click33 + * @since 1.23.0 + */ +public class ClientTokenModel implements Serializable { + + private static final long serialVersionUID = -6541180061782004705L; + + /** + * Client-Token 值 + */ + public String clientToken; + + /** + * Client-Token 到期时间 + */ + public long expiresTime; + + /** + * 应用id + */ + public String clientId; + + /** + * 授权范围 + */ + public String scope; + + public ClientTokenModel() {} + + /** + * 构建一个 + * @param accessToken accessToken + * @param clientId 应用id + * @param scope 请求授权范围 + */ + public ClientTokenModel(String accessToken, String clientId, String scope) { + super(); + this.clientToken = accessToken; + this.clientId = clientId; + this.scope = scope; + } + + @Override + public String toString() { + return "ClientTokenModel [clientToken=" + clientToken + ", expiresTime=" + expiresTime + ", clientId=" + + clientId + ", scope=" + scope + "]"; + } + + /** + * 获取：此 Client-Token 的剩余有效期（秒） + * @return see note + */ + public long getExpiresIn() { + long s = (expiresTime - System.currentTimeMillis()) / 1000; + return s < 1 ? -2 : s; + } + + /** + * 将所有属性转换为下划线形式的Map + * @return 属性转Map + */ + public Map toLineMap() { + Map map = new LinkedHashMap<>(); + map.put("client_token", clientToken); + map.put("expires_in", getExpiresIn()); + map.put("client_id", clientId); + map.put("scope", scope); + return map; + } + + +} diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/CodeModel.java similarity index 98% rename from sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java rename to sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/CodeModel.java index 17f517d5..1e0a4918 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/CodeModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.dev33.satoken.oauth2.model; +package cn.dev33.satoken.oauth2.data.model; import java.io.Serializable; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/RefreshTokenModel.java similarity index 93% rename from sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java rename to sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/RefreshTokenModel.java index d120a358..ae60d9f2 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/RefreshTokenModel.java @@ -1,75 +1,75 @@ -/* - * Copyright 2020-2099 sa-token.cc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.dev33.satoken.oauth2.model; - -import java.io.Serializable; - -/** - * Model: Refresh-Token - * - * @author click33 - * @since 1.23.0 - */ -public class RefreshTokenModel implements Serializable { - - private static final long serialVersionUID = -6541180061782004705L; - - /** - * Refresh-Token 值 - */ - public String refreshToken; - - /** - * Refresh-Token 到期时间 - */ - public long expiresTime; - - /** - * 应用id - */ - public String clientId; - - /** - * 授权范围 - */ - public String scope; - - /** - * 对应账号id - */ - public Object loginId; - - /** - * 对应账号id - */ - public String openid; - - @Override - public String toString() { - return "RefreshTokenModel [refreshToken=" + refreshToken + ", expiresTime=" + expiresTime - + ", clientId=" + clientId + ", scope=" + scope + ", loginId=" + loginId + ", openid=" + openid + "]"; - } - - /** - * 获取：此 Refresh-Token 的剩余有效期（秒） - * @return see note - */ - public long getExpiresIn() { - long s = (expiresTime - System.currentTimeMillis()) / 1000; - return s < 1 ? -2 : s; - } - -} +/* + * Copyright 2020-2099 sa-token.cc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.dev33.satoken.oauth2.data.model; + +import java.io.Serializable; + +/** + * Model: Refresh-Token + * + * @author click33 + * @since 1.23.0 + */ +public class RefreshTokenModel implements Serializable { + + private static final long serialVersionUID = -6541180061782004705L; + + /** + * Refresh-Token 值 + */ + public String refreshToken; + + /** + * Refresh-Token 到期时间 + */ + public long expiresTime; + + /** + * 应用id + */ + public String clientId; + + /** + * 授权范围 + */ + public String scope; + + /** + * 对应账号id + */ + public Object loginId; + + /** + * 对应账号id + */ + public String openid; + + @Override + public String toString() { + return "RefreshTokenModel [refreshToken=" + refreshToken + ", expiresTime=" + expiresTime + + ", clientId=" + clientId + ", scope=" + scope + ", loginId=" + loginId + ", openid=" + openid + "]"; + } + + /** + * 获取：此 Refresh-Token 的剩余有效期（秒） + * @return see note + */ + public long getExpiresIn() { + long s = (expiresTime - System.currentTimeMillis()) / 1000; + return s < 1 ? -2 : s; + } + +} diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/RequestAuthModel.java similarity index 98% rename from sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java rename to sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/RequestAuthModel.java index 8c266e2e..3ee815ec 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/RequestAuthModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.dev33.satoken.oauth2.model; +package cn.dev33.satoken.oauth2.data.model; import java.io.Serializable; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/SaClientModel.java similarity index 99% rename from sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java rename to sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/SaClientModel.java index f0a5ba3d..f7023eca 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/model/SaClientModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.dev33.satoken.oauth2.model; +package cn.dev33.satoken.oauth2.data.model; import java.io.Serializable; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolver.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolver.java index 6d2f5a8e..67d8da7f 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolver.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolver.java @@ -15,8 +15,8 @@ */ package cn.dev33.satoken.oauth2.data.resolver; -import cn.dev33.satoken.oauth2.model.AccessTokenModel; -import cn.dev33.satoken.oauth2.model.ClientTokenModel; +import cn.dev33.satoken.oauth2.data.model.AccessTokenModel; +import cn.dev33.satoken.oauth2.data.model.ClientTokenModel; import cn.dev33.satoken.util.SaResult; import java.util.Map; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolverDefaultImpl.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolverDefaultImpl.java index 79502123..b4df5ee1 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolverDefaultImpl.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/data/resolver/SaOAuth2DataResolverDefaultImpl.java @@ -16,8 +16,8 @@ package cn.dev33.satoken.oauth2.data.resolver; import cn.dev33.satoken.oauth2.consts.SaOAuth2Consts.TokenType; -import cn.dev33.satoken.oauth2.model.AccessTokenModel; -import cn.dev33.satoken.oauth2.model.ClientTokenModel; +import cn.dev33.satoken.oauth2.data.model.AccessTokenModel; +import cn.dev33.satoken.oauth2.data.model.ClientTokenModel; import cn.dev33.satoken.util.SaResult; import java.util.LinkedHashMap; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java index 6b19c80f..af51d95f 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java @@ -26,9 +26,9 @@ import cn.dev33.satoken.oauth2.consts.SaOAuth2Consts.Api; import cn.dev33.satoken.oauth2.consts.SaOAuth2Consts.GrantType; import cn.dev33.satoken.oauth2.consts.SaOAuth2Consts.Param; import cn.dev33.satoken.oauth2.consts.SaOAuth2Consts.ResponseType; +import cn.dev33.satoken.oauth2.data.model.*; import cn.dev33.satoken.oauth2.error.SaOAuth2ErrorCode; import cn.dev33.satoken.oauth2.exception.SaOAuth2Exception; -import cn.dev33.satoken.oauth2.model.*; import cn.dev33.satoken.oauth2.template.SaOAuth2Template; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Template.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Template.java index f411e6aa..9d26c40d 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Template.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Template.java @@ -19,9 +19,9 @@ import cn.dev33.satoken.SaManager; import cn.dev33.satoken.context.model.SaRequest; import cn.dev33.satoken.oauth2.SaOAuth2Manager; import cn.dev33.satoken.oauth2.consts.SaOAuth2Consts.Param; +import cn.dev33.satoken.oauth2.data.model.*; import cn.dev33.satoken.oauth2.error.SaOAuth2ErrorCode; import cn.dev33.satoken.oauth2.exception.SaOAuth2Exception; -import cn.dev33.satoken.oauth2.model.*; import cn.dev33.satoken.strategy.SaStrategy; import cn.dev33.satoken.util.SaFoxUtil; diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Util.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Util.java index 25bbfc41..d40000e0 100644 --- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Util.java +++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/template/SaOAuth2Util.java @@ -16,7 +16,7 @@ package cn.dev33.satoken.oauth2.template; import cn.dev33.satoken.context.model.SaRequest; -import cn.dev33.satoken.oauth2.model.*; +import cn.dev33.satoken.oauth2.data.model.*; import cn.dev33.satoken.oauth2.processor.SaOAuth2ServerProcessor; /**