From 4a30209d2588b27528c80bcff211f655fe8b4ddb Mon Sep 17 00:00:00 2001 From: jkcdev Date: Wed, 21 May 2025 10:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=81=E9=80=80=E6=AC=BE=E7=8E=AF=E8=8A=82=EF=BC=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C=E4=BA=BAID=EF=BC=8C?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=AF=B7=E6=B1=82token=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID=EF=BC=88=E9=9C=80=E8=A6=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0sa-token=E9=85=8D=E7=BD=AE=EF=BC=89=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=8812=E5=B0=8F=E6=97=B6=E6=89=A7=E8=A1=8C=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=EF=BC=89=E3=80=81=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=88=86=E5=BC=80=E9=85=8D=E7=BD=AE=EF=BC=88?= =?UTF-8?q?=E5=8D=8A=E5=B0=8F=E6=97=B6=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cdzy/payment/config/WxPayConfig.java | 13 +++++++------ .../com/cdzy/payment/task/ScheduledTaskManager.java | 8 +++++--- .../src/main/resources/application-dev.yml | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java b/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java index a5f281ae..842f3435 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/config/WxPayConfig.java @@ -2,9 +2,7 @@ package com.cdzy.payment.config; import com.wechat.pay.java.core.Config; import com.wechat.pay.java.core.RSAPublicKeyConfig; -import com.wechat.pay.java.core.cipher.RSASigner; import com.wechat.pay.java.core.cipher.Signer; -import com.wechat.pay.java.core.util.PemUtil; import com.wechat.pay.java.service.payments.jsapi.JsapiService; import com.wechat.pay.java.service.refund.RefundService; import lombok.Data; @@ -12,8 +10,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.security.PrivateKey; - /** * 微信支付配置参数 * @@ -67,10 +63,15 @@ public class WxPayConfig { */ private Integer expireMinute = 1440; /** - * 定时任务执行表达式 + * 支付状态检查定时任务执行表达式 * 默认每12小时执行1次 */ - private String cronExpression = "0 0 0,12 * * ?"; + private String paySchedule = "0 0 0/12 * * ?"; + /** + * 退款状态检查定时任务执行表达式 + * 默认每30分钟执行1次 + */ + private String refundSchedule = "0 0/30 * * * ?"; @Bean public Config certificateConfig() { diff --git a/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java b/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java index b2bd8456..61d448de 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/task/ScheduledTaskManager.java @@ -29,7 +29,9 @@ public class ScheduledTaskManager { @PostConstruct public void init() { - String CRON_EXPRESSION = wxPayConfig.getCronExpression(); + String CRON_EXPRESSION_PAY = wxPayConfig.getPaySchedule(); + String CRON_EXPRESSION_REFUND = wxPayConfig.getRefundSchedule(); + // 启动定时任务 // 1. 每隔30秒执行1次，查询创建未超过5分钟，并且未支付的订单 threadPoolTaskScheduler.schedule(new Runnable() { @@ -41,7 +43,7 @@ public class ScheduledTaskManager { log.error("checkOrderStatus 执行异常", e); } } - }, new CronTrigger(CRON_EXPRESSION)); + }, new CronTrigger(CRON_EXPRESSION_PAY)); //========支付系统自动关闭，不主动关闭，每次发起请求的时候检测是否关闭======== //// 2. 每隔30秒执行1次，查询创建超过5分钟，并且未支付的订单 @@ -66,7 +68,7 @@ public class ScheduledTaskManager { log.error("checkRefundStatus 执行异常", e); } } - }, new CronTrigger(CRON_EXPRESSION)); + }, new CronTrigger(CRON_EXPRESSION_REFUND)); } } diff --git a/ebike-payment/src/main/resources/application-dev.yml b/ebike-payment/src/main/resources/application-dev.yml index beff77d8..406c966e 100644 --- a/ebike-payment/src/main/resources/application-dev.yml +++ b/ebike-payment/src/main/resources/application-dev.yml @@ -43,7 +43,8 @@ payment: pay-notify_url: http://192.168.2.156:10017/wxPayment/pay-notify refund-notify_url: http://192.168.2.156:10017/wxPayment/refund-notify expire-minutes: 1440 - cron-expression: 0 0 0,12 * * ? + pay-schedule: 0 0 0/12 * * ? + refund-schedule: 0 0/30 * * * ? task-scheduler-pool: poolSize: 100 threadNamePrefix: task-scheduled-