Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

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

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");
 
     /**
      * 快递服务商唯一编码

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