tangxiangan 4 ماه پیش
والد
کامیت
364ec5e35e

+ 10 - 9
pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/client/GooglePayClient.java

@@ -144,6 +144,7 @@ public class GooglePayClient {
         return false;
     }
     public static void main(String[] args) {
+        testID();
 //        RestTemplate restTemplate = new RestTemplate();
 //        String url = "https://backend.pdfreaderpro.com/system/google/getSubscriptionGoogleOrderV2" +
 //                "?packageName=" + "com.pdftechnologies.pdfreaderpro" + "&purchaseToken=" + "kkhjiepogghbfcbjndbocpij.AO-J1Ozil3Sz_DnqbMHsyharu_cXVpw2Ev-GFa3gLgbQR7nrumGUXT9hKhydymhgjzcI-KWkpRGB3XrKgX331uCKJPCdbm7t-xpR_j_a5NfzzleHPjVozKI";
@@ -163,20 +164,20 @@ public class GooglePayClient {
 //        // 复制属性
 //        BeanUtils.copyProperties(subscriptionsV2, venueV2);
 //        System.out.println("123");
-        String Period = "7.days,1.years";
-        //7.days:0,1.years:20,1.years:40
-        List<String> dateAndPriceList = Arrays.asList(Period.split(","));
-        int times =  dateAndPriceList.size() > 1 ? 1 : dateAndPriceList.size()-1;
-        String forPeriod = dateAndPriceList.get(times);;
-        LocalDateTime dateTime = LocalDateTime.now();
-        MyDateUtils.TimeAddition(dateTime, forPeriod);
-        System.out.println(111);
+//        String Period = "7.days,1.years";
+//        //7.days:0,1.years:20,1.years:40
+//        List<String> dateAndPriceList = Arrays.asList(Period.split(","));
+//        int times =  dateAndPriceList.size() > 1 ? 1 : dateAndPriceList.size()-1;
+//        String forPeriod = dateAndPriceList.get(times);;
+//        LocalDateTime dateTime = LocalDateTime.now();
+//        MyDateUtils.TimeAddition(dateTime, forPeriod);
+//        System.out.println(111);
     }
 
     private static void testID() {
         String appName = "PDF Reader Pro";
         String packageName = "com.pdftechnologies.pdfreaderpro";
-        String purchaseToken = "jhipfielakfogbkokknmoanp.AO-J1OxYukYaHD50hgafkzEyyGsXTHN2-kWl0RHUdPy39LEWY2-HIcTPF1fCIfQqw56t6yxmnrYUF8_7MWCB7_Rf6DIw8X0wzz92l0afggxS71MFuZkViY0";
+        String purchaseToken = "dkenmfimplmkghceclooknoo.AO-J1OwGTB4uAhsF9moKUyGGjfqKlSp5A2W0YDg2i99i8wrSpHflzjMxjprpdzYwWcJObH-b9pYxrAOJ27r1NtuRBJOZIG4FeePxxe2brVPxZPoSLe_MupA";
         InputStream content = new IOUtils().getGoogleKey();
         try {
             GoogleCredentials googleCredentials = GoogleCredentials.fromStream(content)

+ 1 - 1
pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/OrderGiftLogServiceImpl.java

@@ -54,7 +54,7 @@ public class OrderGiftLogServiceImpl extends ServiceImpl<OrderGiftLogMapper, Ord
                 id,
                 (msg -> {
                     //msg.getMessageProperties().setHeader("x-delay", (24 * 60 * 60 * 1000) + "");
-                    msg.getMessageProperties().setHeader("x-delay", (60 * 1000) + "");
+                    msg.getMessageProperties().setHeader("x-delay", (24 * 60 * 60 * 1000) + "");
                     return msg;
                 }));
         return orderGiftLog;

+ 1 - 1
pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/webhook/GoogleWebhookMonitor.java

@@ -56,7 +56,7 @@ public class GoogleWebhookMonitor {
             // 使用 Java 标准库进行 Base64 解码
             byte[] decodedBytes = Base64.getDecoder().decode(base64Data);
             String data = new String(decodedBytes);
-    //        String data = "{\"version\":\"1.0\",\"packageName\":\"com.pdftechnologies.pdfreaderpro\",\"eventTimeMillis\":\"1730450275958\",\"subscriptionNotification\":{\"version\":\"1.0\",\"notificationType\":2,\"purchaseToken\":\"nbohocncnjkkfejblaegdjcn.AO-J1OzWC-iyg4Je_5ibj2dpsby49UShnZBn0D5jEXO_9OdB0M2E4aUDahXAYflW4udRFMY1VvKvjWmhRK-QDNOe6KCG8LooRPZKQ_suYWRoSXHJiLrJBz4\",\"subscriptionId\":\"new_all_access_pack_monthly\"}}";
+            //        String data = "{\"version\":\"1.0\",\"packageName\":\"com.pdftechnologies.pdfreaderpro\",\"eventTimeMillis\":\"1730450275958\",\"subscriptionNotification\":{\"version\":\"1.0\",\"notificationType\":2,\"purchaseToken\":\"nbohocncnjkkfejblaegdjcn.AO-J1OzWC-iyg4Je_5ibj2dpsby49UShnZBn0D5jEXO_9OdB0M2E4aUDahXAYflW4udRFMY1VvKvjWmhRK-QDNOe6KCG8LooRPZKQ_suYWRoSXHJiLrJBz4\",\"subscriptionId\":\"new_all_access_pack_monthly\"}}";
             log.info("谷歌 接收回调通知值:{}", data);
             DeveloperNotification developerNotification = JSONObject.parseObject(data, DeveloperNotification.class);
             if(ObjectUtils.isEmpty(developerNotification.getSubscriptionNotification())){