aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/3.0' into dev/dev

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/common/task/AccountTask.java
This commit is contained in:
徐佩
2024-07-21 09:54:42 +08:00
parent c46f65600f 56ebcfbce2
commit 34c4cd47ef
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
View File

@@ -11,24 +11,24 @@ public class MQConfig {
// public static final String GENERATE_QUEUE = "generate-queue-prod";
// public static final String GENERATE_QUEUE = "generate-queue-test";
// ==================================================================
public static final String GENERATE_QUEUE = "generate-queue-local";
// public static final String GENERATE_QUEUE = "generate-queue-local";
// public static final String GENERATE_QUEUE = "generate-queue-dev";
// public static final String GENERATE_QUEUE = "generate-queue-prod";
public static final String GENERATE_QUEUE = "generate-queue-prod";
//
public static final String SR_QUEUE = "SR-queue-local";
// public static final String SR_QUEUE = "SR-queue-local";
// public static final String SR_QUEUE = "SR-queue-dev";
// public static final String SR_QUEUE = "SR-queue-prod";
public static final String SR_QUEUE = "SR-queue-prod";
//
public static final String SR_RESULT_QUEUE = "SuperResolution-local";
// public static final String SR_RESULT_QUEUE = "SuperResolution-local";
// public static final String SR_RESULT_QUEUE = "SuperResolution-dev";
// public static final String SR_RESULT_QUEUE = "SuperResolution-prod";
public static final String SR_RESULT_QUEUE = "SuperResolution-prod";
//
public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local";
// public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod";
// public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local";
public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod";
public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-local";
public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-prod";
public static final String RELIGHT_RESULT_QUEUE = "Relight-local";
public static final String RELIGHT_RESULT_QUEUE = "Relight-prod";
public MQConfig() {
}

4
src/main/java/com/ai/da/common/task/PaypalTask.java
View File

@@ -23,12 +23,12 @@ public class PaypalTask {
@Resource
private PayPalCheckoutService payPalCheckoutService;
// @Scheduled(cron = "0/30 * * * * ?")
@Scheduled(cron = "0/30 * * * * ?")
public void orderConfirm() throws SerializeException {
// log.info("PayPal orderConfirm 被执行......");
List<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.PAYPAL.getType());
List<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(30, PayTypeEnum.PAYPAL.getType());
for (OrderInfo orderInfo : orderInfoList) {
String orderNo = orderInfo.getOrderNo();

2
src/main/java/com/ai/da/common/task/StripeTask.java
View File

@@ -22,7 +22,7 @@ public class StripeTask {
@Resource
private StripeService stripeService;
// @Scheduled(cron = "0/30 * * * * ?")
@Scheduled(cron = "0/30 * * * * ?")
public void orderConfirm() throws SerializeException {
// 查看超过30分钟以上仍未支付的订单 置为超时订单