commit

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

@@ -51,8 +51,15 @@ 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 = "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
@@ -268,6 +275,8 @@ public class PddLocalController {
         if(mailNoResponse.getStatus() != StatusEnum.INBOUND.getCode()){
             //重复入库
             notifyRequest.setPackageQuantity(num); // 已入库数量
+            mailNoResponse.setEnterTime(timeTool.getNowDate());
+            mailNoResponse.setStatus(StatusEnum.INBOUND.getCode());
 
         }else {
 

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

@@ -102,7 +102,7 @@ public class PddOpenController {
         log.info("Request:\n{}", body);
 
         try {
-            if (!PddSignTool.verifySignFromBody(body, "a5aba84483d8387030899f01276b06a194942470", pdd_sign)) {
+            if (!PddSignTool.verifySignFromBody(body, "281d79ad5117d20a51efb9e7b0d5f7ee336399b0", pdd_sign)) {
                 log.error("验签失败");
             }
             switch (requestParam.getType()) {

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

@@ -53,7 +53,6 @@ public class PddGDUtil {
         request.setTimestamp(time);
         request.setSign(PddSignTool.generateSign(request, CLIENT_SECRET));
         String resp = PddHttpTool.sendJsonPostGD(request);
-        log.info("resp = {}", resp);
         return JSON.parseObject(resp);
     }
 }

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

@@ -43,16 +43,30 @@ public class PddHttpTool {
     public static String sendJsonPost(Object requestObj) {
         log.info("REQ:{}", JSONObject.toJSONString(requestObj));
         // 自动序列化 requestObj 为 JSON，并设置 Content-Type: application/json
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("X-Canary-Staging", "staging");
+        headers.add("Content-Type", "application/json;charset=UTF-8");
+        HttpEntity<String> requestEntity = new HttpEntity<>(JSONObject.toJSONString(requestObj), headers);
+
+        // 2. 封装请求实体（参数 + 头信息）
         RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<String> resp = restTemplate.postForEntity(URL, requestObj, String.class);
+        ResponseEntity<String> resp = restTemplate.postForEntity(URL, requestEntity, String.class);
+        log.info("RESP:{}", resp.getBody());
         return resp.getBody();
     }
 
     public static String sendJsonPostGD(Object requestObj) {
         log.info("REQ:{}", JSONObject.toJSONString(requestObj));
         // 自动序列化 requestObj 为 JSON，并设置 Content-Type: application/json
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("X-Canary-Staging", "staging");
+        headers.add("Content-Type", "application/json;charset=UTF-8");
+        HttpEntity<String> requestEntity = new HttpEntity<>(JSONObject.toJSONString(requestObj), headers);
+
+        // 2. 封装请求实体（参数 + 头信息）
         RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<String> resp = restTemplate.postForEntity(URL_GD, requestObj, String.class);
+        ResponseEntity<String> resp = restTemplate.postForEntity(URL_GD, requestEntity, String.class);
+        log.info("RESP:{}", resp.getBody());
         return resp.getBody();
     }
 }

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_prod?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

@@ -22,7 +22,7 @@ public class CommonTest {
     private static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
     private static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
 
-    private String firstLogisticsOrderCode = "PC25110416466837504037527";
+    private String firstLogisticsOrderCode = "PC25110715653142530023271";
 
     private static String getNowString() {
         Date date = new Date();
@@ -92,8 +92,8 @@ public class CommonTest {
      */
     @Test
     public void receive() {
-        String mailNo = "773846466954492";
-        String expressCode = "STO";
+        String mailNo = "SF3270717746148";
+        String expressCode = "SF";
         String action = "warehouse_sign";
         PddServiceConsoFirstBizActionNotifyRequest notifyRequest = new PddServiceConsoFirstBizActionNotifyRequest();
         notifyRequest.setProviderCode(PROVIDER_CODE);
@@ -198,8 +198,8 @@ public class CommonTest {
     @Test
     public void inBound() {
 
-        String mailNo = "773846466954492";
-        String expressCode = "STO";
+        String mailNo = "SF3270717746148";
+        String expressCode = "SF";
         PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
 
 
@@ -220,8 +220,8 @@ public class CommonTest {
         notifyRequest.getPackageInfo().setLength(30L);
         notifyRequest.getPackageInfo().setWidth(30L);
         notifyRequest.getPackageInfo().setHeight(30L);
-        notifyRequest.getPackageInfo().setWeight(600L);
-        notifyRequest.getPackageInfo().setActualWeight(600L);
+        notifyRequest.getPackageInfo().setWeight(1000L);
+        notifyRequest.getPackageInfo().setActualWeight(1000L);
         notifyRequest.getPackageInfo().setGoodsType("NORMAL");
 
         notifyRequest.setResult(new PddServiceConsoInboundRequest.Result());