From aa4636c24bde6014a0c6475c14c461dfc3dda8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= <liangyuqi@bdfint.com>
Date: Thu, 14 Aug 2025 15:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=86=E9=80=9A=E7=94=9F=E4=BA=A7=E8=81=94?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-prod.yml   |  4 +-
 .../manager/impl/YtoExpressManagerImpl.java   | 59 +++++++++----------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 8dc08b604..d25bb49ae 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -262,8 +262,8 @@ zto:
 yto:
   appKey: K280280756
   appSecret: iplud2s6
-  appKey2: K280280756
-  appSecret2: iplud2s6
+  appKey2: ZCBJ_STD
+  appSecret2: xJa1tc2A
   gatewayUrl: https://openapi.yto.net.cn:11443/
 
 # 支付宝配置
diff --git a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java
index 4f77b9a46..cba362dbb 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java
@@ -193,36 +193,35 @@ public class YtoExpressManagerImpl implements ExpressManager {
 
     @Override
     public boolean subscribeTrack(ExpressTrackSubReqDTO trackSubReq) {
-//        Assert.notNull(trackSubReq.getExpressWaybillNo());
-//        YtoSubTrackParam.LogisticsInterface logisticsInterface = new YtoSubTrackParam.LogisticsInterface();
-//        logisticsInterface.setClientId(appKey2);
-//        logisticsInterface.setWaybillNo(trackSubReq.getExpressWaybillNo());
-//        YtoSubTrackParam ytoSubTrackParam = new YtoSubTrackParam();
-//        ytoSubTrackParam.setClient_id(appKey2);
-//        ytoSubTrackParam.setMsg_type("online");
-//        ytoSubTrackParam.setLogistics_interface(JSONUtil.toJsonStr(logisticsInterface));
-//        try {
-//            String param = JSONUtil.toJsonStr(ytoSubTrackParam);
-//            String sign = YtoSignUtil.sign("subscribe_adapter", "v1", param, appSecret2);
-//            YtoPublicRequest request = YtoPublicRequest.builder()
-//                    .timestamp(System.currentTimeMillis())
-//                    .param(param)
-//                    .format(YtoPublicRequest.EFormat.JSON)
-//                    .sign(sign).build();
-//            String rtnStr = HttpUtil.post(gatewayUrl + "open/subscribe_adapter/v1/av7bfQ/" + appKey2,
-//                    JSONUtil.toJsonStr(request));
-//            log.info("圆通轨迹订阅返回信息: {}", rtnStr);
-//            JSONObject rtnJson = JSONUtil.parseObj(rtnStr);
-//            Boolean success = rtnJson.getBool("success");
-//            if (BooleanUtil.isTrue(success)) {
-//                return true;
-//            }
-//        } catch (Exception e) {
-//            log.error("圆通轨迹订阅异常", e);
-//        }
-//        log.warn("圆通轨迹订阅失败: {}", trackSubReq);
-//        return false;
-        return true;
+        Assert.notNull(trackSubReq.getExpressWaybillNo());
+        YtoSubTrackParam.LogisticsInterface logisticsInterface = new YtoSubTrackParam.LogisticsInterface();
+        logisticsInterface.setClientId(appKey2);
+        logisticsInterface.setWaybillNo(trackSubReq.getExpressWaybillNo());
+        YtoSubTrackParam ytoSubTrackParam = new YtoSubTrackParam();
+        ytoSubTrackParam.setClient_id(appKey2);
+        ytoSubTrackParam.setMsg_type("online");
+        ytoSubTrackParam.setLogistics_interface(JSONUtil.toJsonStr(logisticsInterface));
+        try {
+            String param = JSONUtil.toJsonStr(ytoSubTrackParam);
+            String sign = YtoSignUtil.sign("subscribe_adapter", "v1", param, appSecret2);
+            YtoPublicRequest request = YtoPublicRequest.builder()
+                    .timestamp(System.currentTimeMillis())
+                    .param(param)
+                    .format(YtoPublicRequest.EFormat.JSON)
+                    .sign(sign).build();
+            String rtnStr = HttpUtil.post(gatewayUrl + "open/subscribe_adapter/v1/av7bfQ/" + appKey2,
+                    JSONUtil.toJsonStr(request));
+            log.info("圆通轨迹订阅返回信息: {}", rtnStr);
+            JSONObject rtnJson = JSONUtil.parseObj(rtnStr);
+            Boolean success = rtnJson.getBool("success");
+            if (BooleanUtil.isTrue(success)) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("圆通轨迹订阅异常", e);
+        }
+        log.warn("圆通轨迹订阅失败: {}", trackSubReq);
+        return false;
     }