From 7377df3408513663134dfd0392a80a95c41c3748 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Fri, 12 May 2023 10:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-context-dubbo=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SaTokenSecondContextCreatorForDubbo.java | 4 ++-- .../dubbo/SaTokenSecondContextForDubbo.java | 4 ++-- .../dubbo/filter/SaTokenDubboConsumerFilter.java | 15 +++++++-------- .../dubbo/filter/SaTokenDubboProviderFilter.java | 8 ++++---- .../context/dubbo/model/SaRequestForDubbo.java | 9 ++++----- .../context/dubbo/model/SaResponseForDubbo.java | 8 ++++---- .../context/dubbo/model/SaStorageForDubbo.java | 8 ++++---- 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java index a80e1ea0..d4e37601 100644 --- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java +++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java @@ -4,10 +4,10 @@ import cn.dev33.satoken.context.second.SaTokenSecondContext; import cn.dev33.satoken.context.second.SaTokenSecondContextCreator; /** - * Sa-Token 二级Context - 创建器 [Dubbo版] + * Sa-Token 二级上下文 - 创建器 [ Dubbo版 ] * * @author click33 - * + * @since <= 1.34.0 */ public class SaTokenSecondContextCreatorForDubbo implements SaTokenSecondContextCreator { diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java index 0029c967..1ab49834 100644 --- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java +++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java @@ -12,10 +12,10 @@ import cn.dev33.satoken.context.second.SaTokenSecondContext; import cn.dev33.satoken.exception.ApiDisabledException; /** - * Sa-Token 上下文 [Dubbo版本] + * Sa-Token 二级上下文 [ Dubbo版本 ] * * @author click33 - * + * @since <= 1.34.0 */ public class SaTokenSecondContextForDubbo implements SaTokenSecondContext { diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java index b2a85afe..520a16ff 100644 --- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java +++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java @@ -16,11 +16,10 @@ import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.util.SaTokenConsts; /** - * - * Sa-Token 整合 Dubbo Consumer端过滤器 + * Sa-Token 整合 Dubbo Consumer 端（调用端）过滤器 * * @author click33 - * + * @since <= 1.34.0 */ @Activate(group = {CommonConstants.CONSUMER}, order = -30000) public class SaTokenDubboConsumerFilter implements Filter { @@ -28,23 +27,23 @@ public class SaTokenDubboConsumerFilter implements Filter { @Override public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { - // 追加 Same-Token 参数 + // 1、追加 Same-Token 参数 if(SaManager.getConfig().getCheckSameToken()) { RpcContext.getContext().setAttachment(SaSameUtil.SAME_TOKEN, SaSameUtil.getToken()); } - // 1. 调用前，向下传递会话Token + // 2、调用前，向下传递会话Token if(SaManager.getSaTokenContextOrSecond() != SaTokenContextDefaultImpl.defaultContext) { RpcContext.getContext().setAttachment(SaTokenConsts.JUST_CREATED, StpUtil.getTokenValueNotCut()); } - // 2. 开始调用 + // 3、开始调用 Result invoke = invoker.invoke(invocation); - // 3. 调用后，解析回传的Token值 + // 4、调用后，解析回传的Token值 StpUtil.setTokenValue(invoke.getAttachment(SaTokenConsts.JUST_CREATED_NOT_PREFIX)); - // note + // 5、返回结果 return invoke; } diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java index 7c8c1091..ad29df56 100644 --- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java +++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java @@ -12,11 +12,10 @@ import cn.dev33.satoken.SaManager; import cn.dev33.satoken.same.SaSameUtil; /** - * - * Sa-Token 整合 Dubbo Provider端过滤器 + * Sa-Token 整合 Dubbo Provider端（被调用端）过滤器 * * @author click33 - * + * @since <= 1.34.0 */ @Activate(group = {CommonConstants.PROVIDER}, order = -30000) public class SaTokenDubboProviderFilter implements Filter { @@ -27,7 +26,8 @@ public class SaTokenDubboProviderFilter implements Filter { // RPC 调用鉴权 if(SaManager.getConfig().getCheckSameToken()) { String idToken = invocation.getAttachment(SaSameUtil.SAME_TOKEN); - // dubbo部分协议会将参数变为小写，详细参考：https://gitee.com/dromara/sa-token/issues/I4WXQG + + // dubbo部分协议会将参数变为小写，此处需要额外处理一下，详细参考：https://gitee.com/dromara/sa-token/issues/I4WXQG if(idToken == null) { idToken = invocation.getAttachment(SaSameUtil.SAME_TOKEN.toLowerCase()); } diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java index 702319c8..4abf69d4 100644 --- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java +++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java @@ -1,17 +1,16 @@ package cn.dev33.satoken.context.dubbo.model; -import org.apache.dubbo.rpc.RpcContext; - import cn.dev33.satoken.context.model.SaRequest; +import org.apache.dubbo.rpc.RpcContext; import java.util.List; import java.util.Map; /** - * Request for Dubbo - * - * @author click33 + * 对 SaRequest 包装类的实现（Dubbo 版） * + * @author click33 + * @since <= 1.34.0 */ public class SaRequestForDubbo implements SaRequest { diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java index 90986cf4..b36ddac7 100644 --- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java +++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java @@ -1,13 +1,13 @@ package cn.dev33.satoken.context.dubbo.model; +import cn.dev33.satoken.context.model.SaResponse; import org.apache.dubbo.rpc.RpcContext; -import cn.dev33.satoken.context.model.SaResponse; - /** - * Response for Servlet - * @author click33 + * 对 SaResponse 包装类的实现（Dubbo 版） * + * @author click33 + * @since <= 1.34.0 */ public class SaResponseForDubbo implements SaResponse { diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java index 8a1e9a24..c4a3676f 100644 --- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java +++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java @@ -1,14 +1,14 @@ package cn.dev33.satoken.context.dubbo.model; -import org.apache.dubbo.rpc.RpcContext; - import cn.dev33.satoken.context.model.SaStorage; import cn.dev33.satoken.util.SaTokenConsts; +import org.apache.dubbo.rpc.RpcContext; /** - * Storage for Servlet - * @author click33 + * 对 SaStorage 包装类的实现（Dubbo 版） * + * @author click33 + * @since <= 1.34.0 */ public class SaStorageForDubbo implements SaStorage {