From 767d503790f546f3d5b7662da84ac98e6ee2693d Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 4 May 2025 10:53:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E3=80=90MALL=20=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E3=80=91linux=20=E9=83=A8=E7=BD=B2=E6=97=B6=EF=BC=8Ce?= =?UTF-8?q?xpress.client=20=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E5=A4=A7=E5=86=99=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/delivery/core/enums/ExpressClientEnum.java | 6 +++--- .../src/main/resources/application.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/delivery/core/enums/ExpressClientEnum.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/delivery/core/enums/ExpressClientEnum.java index 81b96184c..c852e03ea 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/delivery/core/enums/ExpressClientEnum.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/delivery/core/enums/ExpressClientEnum.java @@ -12,9 +12,9 @@ import lombok.Getter; @AllArgsConstructor public enum ExpressClientEnum { - NOT_PROVIDE("not-provide","未提供"), - KD_NIAO("kd-niao", "快递鸟"), - KD_100("kd-100", "快递100"); + NOT_PROVIDE("not_provide","未提供"), + KD_NIAO("kd_niao", "快递鸟"), + KD_100("kd_100", "快递100"); /** * 快递服务商唯一编码 diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/resources/application.yaml b/yudao-module-mall/yudao-module-trade-biz/src/main/resources/application.yaml index b45cf90eb..ff5d4427a 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/resources/application.yaml +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/resources/application.yaml @@ -129,7 +129,7 @@ yudao: receive-expire-time: 14d # 收货的过期时间 comment-expire-time: 7d # 评论的过期时间 express: - client: KD_NIAO + client: kd_100 kd-niao: api-key: cb022f1e-48f1-4c4a-a723-9001ac9676b8 business-id: 1809751 From fb238738a05f9b9ff6adb25f5155f2613c7509fc Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 4 May 2025 15:42:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(gateway):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=81=B0=E5=BA=A6=E8=B4=9F=E8=BD=BD=E5=9D=87=E8=A1=A1=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E7=9A=84=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=20#213?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filter/grey/GrayReactiveLoadBalancerClientFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java index 91c226020..9d0786dfa 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java +++ b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java @@ -47,7 +47,8 @@ public class GrayReactiveLoadBalancerClientFilter implements GlobalFilter, Order @Override public int getOrder() { - return ReactiveLoadBalancerClientFilter.LOAD_BALANCER_CLIENT_FILTER_ORDER; + // https://github.com/YunaiV/yudao-cloud/pull/213 + return ReactiveLoadBalancerClientFilter.LOAD_BALANCER_CLIENT_FILTER_ORDER - 50; } @Override