From c31d52d8b48b5889d062bd201fe15f439e9cd78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 8 Mar 2022 02:13:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=87=8D=E7=A3=85=E6=9B=B4=E6=96=B0]=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=20dubbo=203.0=20=E4=BD=BF=E7=94=A8=E5=8E=9F?= =?UTF-8?q?=E7=94=9F=20starter=20=E6=95=B4=E5=90=88=20=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E4=B8=8E=20feign=20=E7=9A=84=E6=97=A0=E7=94=A8=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev/application.yml | 7 +++++++ ruoyi-common/ruoyi-common-alibaba-bom/pom.xml | 2 +- ruoyi-common/ruoyi-common-dict/pom.xml | 5 +++-- ruoyi-common/ruoyi-common-dubbo/pom.xml | 4 ++-- .../context/dubbo/filter/SaTokenDubboConsumerFilter.java | 4 ++-- .../com/ruoyi/common/dubbo/filter/DubboRequestFilter.java | 2 +- ruoyi-common/ruoyi-common-loadbalancer/pom.xml | 5 +++-- ruoyi-common/ruoyi-common-log/pom.xml | 5 +++-- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/config/dev/application.yml b/config/dev/application.yml index e821a68f..f4bc9b72 100644 --- a/config/dev/application.yml +++ b/config/dev/application.yml @@ -17,6 +17,13 @@ server: dubbo: application: logger: slf4j + # 可选值 interface、instance、all，默认是 all，即接口级地址、应用级地址都注册 + register-mode: all + service-discovery: + # FORCE_INTERFACE，只消费接口级地址，如无地址则报错，单订阅 2.x 地址 + # APPLICATION_FIRST，智能决策接口级/应用级地址，双订阅 + # FORCE_APPLICATION，只消费应用级地址，如无地址则报错，单订阅 3.x 地址 + migration: APPLICATION_FIRST protocol: # 使用dubbo协议通信 name: dubbo diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index f7e4ac55..7ee67883 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -23,7 +23,7 @@ 1.1.0 2.0.4 1.4.2 - 2.7.15 + 3.0.6 1.0.11 diff --git a/ruoyi-common/ruoyi-common-dict/pom.xml b/ruoyi-common/ruoyi-common-dict/pom.xml index f89845c9..0a72ccd7 100644 --- a/ruoyi-common/ruoyi-common-dict/pom.xml +++ b/ruoyi-common/ruoyi-common-dict/pom.xml @@ -29,8 +29,9 @@ - com.alibaba.cloud - spring-cloud-starter-dubbo + org.apache.dubbo + dubbo-spring-boot-starter + provided diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml index 9a92ad69..54575ede 100644 --- a/ruoyi-common/ruoyi-common-dubbo/pom.xml +++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml @@ -22,8 +22,8 @@ - com.alibaba.cloud - spring-cloud-starter-dubbo + org.apache.dubbo + dubbo-spring-boot-starter diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java index 3eb58625..9b33f8ef 100644 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java @@ -30,12 +30,12 @@ public class SaTokenDubboConsumerFilter implements Filter { // 追加 Id-Token 参数 if(SaManager.getConfig().getCheckIdToken()) { - RpcContext.getContext().setAttachment(SaIdUtil.ID_TOKEN, SaIdUtil.getToken()); + RpcContext.getServiceContext().setAttachment(SaIdUtil.ID_TOKEN, SaIdUtil.getToken()); } // 1. 调用前，向下传递会话Token if(SaManager.getSaTokenContextOrSecond() != SaTokenContextDefaultImpl.defaultContext) { - RpcContext.getContext().setAttachment(SaTokenConsts.JUST_CREATED, StpUtil.getTokenValueNotCut()); + RpcContext.getServiceContext().setAttachment(SaTokenConsts.JUST_CREATED, StpUtil.getTokenValueNotCut()); } // 2. 开始调用 diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/com/ruoyi/common/dubbo/filter/DubboRequestFilter.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/com/ruoyi/common/dubbo/filter/DubboRequestFilter.java index 42b1d0e0..4c8fd6f3 100644 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/com/ruoyi/common/dubbo/filter/DubboRequestFilter.java +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/com/ruoyi/common/dubbo/filter/DubboRequestFilter.java @@ -27,7 +27,7 @@ public class DubboRequestFilter implements Filter { return invoker.invoke(invocation); } String client = CommonConstants.PROVIDER; - if (RpcContext.getContext().isConsumerSide()) { + if (RpcContext.getServiceContext().isConsumerSide()) { client = CommonConstants.CONSUMER; } String baselog = "Client[" + client + "],InterfaceName=[" + invocation.getInvoker().getInterface().getSimpleName() + "],MethodName=[" + invocation.getMethodName() + "]"; diff --git a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml index 76348b90..34b0f119 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml +++ b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml @@ -21,8 +21,9 @@ spring-cloud-starter-loadbalancer - com.alibaba.cloud - spring-cloud-starter-dubbo + org.apache.dubbo + dubbo-spring-boot-starter + provided diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 1e09166a..d1597db0 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -24,8 +24,9 @@ - com.alibaba.cloud - spring-cloud-starter-dubbo + org.apache.dubbo + dubbo-spring-boot-starter + provided