From 986111b10cd53865c0ae44bd512b5d5d4bd571bc Mon Sep 17 00:00:00 2001 From: xiumu <1196606665@qq.com> Date: Mon, 2 Jun 2025 17:20:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E9=87=8D=E5=86=99?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=AB=98=E7=BA=A7=E6=9D=83=E9=99=90=E4=B8=8E?= =?UTF-8?q?=E4=BD=8E=E7=BA=A7=E6=9D=83=E9=99=90=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将获取高级权限以及低级权限的方法放到SaOAuth2DataLoader中, 可以自定义权限数据的加载来源 --- .../data/loader/SaOAuth2DataLoader.java | 19 +++++++++++++++++++ .../oauth2/template/SaOAuth2Template.java | 6 ++---- 2 files changed, 21 insertions(+), 4 deletions(-) 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 55f2f749..bb438f14 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 @@ -21,6 +21,8 @@ import cn.dev33.satoken.oauth2.error.SaOAuth2ErrorCode; import cn.dev33.satoken.oauth2.exception.SaOAuth2ClientModelException; import cn.dev33.satoken.secure.SaSecureUtil; +import java.util.List; + /** * Sa-Token OAuth2 数据加载器 * @@ -78,4 +80,21 @@ public interface SaOAuth2DataLoader { return SaSecureUtil.md5(SaOAuth2Manager.getServerConfig().getUnionidDigestPrefix() + "_" + subjectId + "_" + loginId); } + /** + * 获取高级权限列表 + * @return / + */ + default List getHigherScopeList() { + String higherScope = SaOAuth2Manager.getServerConfig().getHigherScope(); + return SaOAuth2Manager.getDataConverter().convertScopeStringToList(higherScope); + } + + /** + * 获取低级权限列表 + * @return / + */ + default List getLowerScopeList() { + String lowerScope = SaOAuth2Manager.getServerConfig().getLowerScope(); + return SaOAuth2Manager.getDataConverter().convertScopeStringToList(lowerScope); + } } 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 54cf1e87..1aca7e39 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 @@ -765,8 +765,7 @@ public class SaOAuth2Template { * @return / */ public List getHigherScopeList() { - String higherScope = SaOAuth2Manager.getServerConfig().getHigherScope(); - return SaOAuth2Manager.getDataConverter().convertScopeStringToList(higherScope); + return SaOAuth2Manager.getDataLoader().getHigherScopeList(); } /** @@ -774,8 +773,7 @@ public class SaOAuth2Template { * @return / */ public List getLowerScopeList() { - String lowerScope = SaOAuth2Manager.getServerConfig().getLowerScope(); - return SaOAuth2Manager.getDataConverter().convertScopeStringToList(lowerScope); + return SaOAuth2Manager.getDataLoader().getLowerScopeList(); } }