commit

PddServer/src/main/java/org/ta/pddserver/controller/PddFZController.java

@@ -36,8 +36,8 @@ public class PddFZController {
     private static final String PROVIDER_CODE = "HAIJI_KR";
     private static final String WAREHOUSE_CODE = "HJJY001";
 
-    private static final String CLIENT_ID = "27dbbb055eef41e28124f03fdb26fba8";
-    private static final String CLIENT_SECRET = "4be28e29e58012b72b080431a8d47ec2ba7cab4d";
+    private static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+    private static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
 
     @Resource
     LogOrderMailDetailImpl logOrderMailDetailImpl;

PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java

@@ -48,8 +48,8 @@ public class PddLocalController {
 
     private static final String PROVIDER_CODE = "HAIJI_KR";
     private static final String WAREHOUSE_CODE = "HJJY001";
-    private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
-    private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
+    private static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+    private static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
     @Resource
     private CollectReceiverDetailImpl collectReceiverDetailImpl;
     @Resource

PddServer/src/main/java/org/ta/pddserver/model/pddlg/request/PddLogisticsCoTrackNotifyRequest.java

@@ -38,7 +38,7 @@ public class PddLogisticsCoTrackNotifyRequest extends LGBaseModel {
     @Override
     public void encodeData() {
         this.data = JSON.toJSONString(this.dataObject.getTraces());
-        log.info("data={}", this.data);
+//        log.info("data={}", this.data);
         this.dataObject = null;
     }
 }

PddServer/src/main/java/org/ta/pddserver/utils/PddGDUtil.java

@@ -12,8 +12,8 @@ import java.util.List;
 
 @Slf4j
 public class PddGDUtil {
-    private static final String CLIENT_ID = "7c75c365a1a64036a598ab6b09ce0c06";
-    private static final String CLIENT_SECRET = "f0752b6d5d6c214b7e255586fc4dfde382e9a6df";
+    private static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+    private static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
 
     private static final int page_size = 100;
 
@@ -24,12 +24,17 @@ public class PddGDUtil {
         List<GDTicketRepsonse> list = new ArrayList<GDTicketRepsonse>();
         while (page * page_size <= total_count) {
             page++;
+            try {
                 JSONObject jsonObject = getTicketsByPage(1, end);
                 total_count = jsonObject.getInteger("total_count");
                 List<GDTicketRepsonse> tempList = jsonObject.getJSONArray("logistics_ticket_list").toJavaList(GDTicketRepsonse.class);
                 if (tempList != null && !tempList.isEmpty()) {
                     list.addAll(tempList);
                 }
+            } catch (Exception e) {
+                log.error("工单获取失败");
+            }
+
         }
         return list;
     }

PddServer/src/main/java/org/ta/pddserver/utils/PddHttpTool.java

@@ -14,9 +14,10 @@ import java.util.Map;
 
 
 public class PddHttpTool {
-    private static final String URL = "https://opengw-api.hutaojie.com/ark/router";
-    private static final String URL_GD = "https://opengw-api.hutaojie.com/api/router";
-//    private static final String URL = "https://ark-api.pinduoduo.com/ark/router";
+//    private static final String URL = "https://opengw-api.hutaojie.com/ark/router";
+//    private static final String URL_GD = "https://opengw-api.hutaojie.com/api/router";
+    private static final String URL = "https://ark-api.pinduoduo.com/ark/router";
+    private static final String URL_GD = "https://gw-api.pinduoduo.com/api/router";
 
     public static String postRequest(JYBaseRequestModel request) {
 

PddServer/src/main/java/org/ta/pddserver/xxl/GDOperator.java

 package org.ta.pddserver.xxl;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.GDTicketEntity;
 import org.ta.pddserver.model.pddgd.response.GDTicketRepsonse;
@@ -9,17 +12,25 @@ import org.ta.pddserver.service.GDTicketService;
 import org.ta.pddserver.service.impl.GDTicketImpl;
 import org.ta.pddserver.utils.PddGDUtil;
 
+import java.util.Date;
 import java.util.List;
 
-@Service
+@Component
 @Slf4j
 public class GDOperator {
 
     @Resource
     GDTicketImpl gdTicketImpl;
 
+    @PostConstruct
+    public void init(){
+        getGdTickets();
+    }
+
+    @Scheduled(fixedRate = 1000 * 60 * 5) // 每5分钟执行一次
     public void getGdTickets() {
         List<GDTicketRepsonse> list = PddGDUtil.getTickets();
+        log.info("{} 工单数量：{}", new Date().toLocaleString(), list.size());
         for (GDTicketRepsonse gdTicketRepsonse : list) {
             GDTicketEntity  gdTicketEntity = gdTicketImpl.getByTicketId(gdTicketRepsonse.getTicket_id());
             if (gdTicketEntity == null) {

PddServer/src/main/resources/application.yaml

 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-    username: root
-    password: root
-#    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-#    username: pdd
-#    password: pdd123
+#    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+#    username: root
+#    password: root
+    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+    username: pdd
+    password: pdd123
     hikari:
       minimum-idle: 5  # 最小空闲连接数
       maximum-pool-size: 10  # 最大活跃连接数

PddServer/src/test/java/org/ta/pddserver/CommonTest.java

@@ -19,8 +19,8 @@ public class CommonTest {
     private static final String PROVIDER_CODE = "HAIJI_KR";
     private static final String WAREHOUSE_CODE = "HJJY001";
 
-    private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
-    private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
+    private static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+    private static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
 
     private String firstLogisticsOrderCode = "PC25110416466837504037527";
 

PddServer/src/test/java/org/ta/pddserver/GDTest3.java

@@ -26,8 +26,8 @@ import java.util.List;
 @Slf4j
 public class GDTest3 {
 
-    private static final String CLIENT_ID = "7c75c365a1a64036a598ab6b09ce0c06";
-    private static final String CLIENT_SECRET = "f0752b6d5d6c214b7e255586fc4dfde382e9a6df";
+    private static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+    private static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
 
     @Test
     public void test1() {

PddServer/src/test/java/org/ta/pddserver/LGTest2.java

@@ -15,8 +15,8 @@ import java.util.ArrayList;
 @Slf4j
 public class LGTest2 {
 
-    private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
-    private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
+    private static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+    private static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
 
     @Test
     public void test1() {