diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index be6bd63b..84f7d1ee 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -202,7 +202,7 @@ public class MyTaskScheduler { } } -// @Scheduled(cron = "0 0 9 * * ?") + @Scheduled(cron = "0 0 9 * * ?") public void sendTrialOrderExcelToManagements() { // 获取前一天日期 LocalDate yesterday = LocalDate.now().minusDays(1); diff --git a/src/main/java/com/ai/da/common/task/PaymentTask.java b/src/main/java/com/ai/da/common/task/PaymentTask.java index 0e5efb03..009ffc09 100644 --- a/src/main/java/com/ai/da/common/task/PaymentTask.java +++ b/src/main/java/com/ai/da/common/task/PaymentTask.java @@ -45,7 +45,7 @@ public class PaymentTask { @Resource private PayPalCheckoutService payPalCheckoutService; -// @Scheduled(cron = "0/30 * * * * ?") + @Scheduled(cron = "0/30 * * * * ?") public void orderConfirmForPaypal() throws SerializeException { // log.info("PayPal orderConfirm 被执行......"); diff --git a/src/main/java/com/ai/da/common/utils/SendRequestUtil.java b/src/main/java/com/ai/da/common/utils/SendRequestUtil.java index b0d18580..aa8aec11 100644 --- a/src/main/java/com/ai/da/common/utils/SendRequestUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendRequestUtil.java @@ -114,8 +114,8 @@ public class SendRequestUtil { public String sendFluxPost(String url, String requestBodyStr) { // 尝试两个API key - String[] apiKeys = {"d447a0ac-2291-4f1c-9a36-f7614c385989", - "84e8f5d5-b0b3-49aa-b244-ab7ba27e7ae7"}; + String[] apiKeys = {"84e8f5d5-b0b3-49aa-b244-ab7ba27e7ae7", + "d447a0ac-2291-4f1c-9a36-f7614c385989"}; boolean[] notified = {false, false}; // 记录是否已发送过不足提醒 for (int i = 0; i < apiKeys.length; i++) { @@ -140,22 +140,9 @@ public class SendRequestUtil { if (status == 402 || status == 403) { if (!notified[i]) { SendEmailUtil.commonExceptionReminder( - "Flux账户积分不足,flux生成任务失败", - new String[]{"xupei3360@163.com"} + "Flux账户积分不足,flux生成任务失败。(key:)" + apiKeys[i], + new String[]{"xupei3360@163.com", "fangjianliao@aidlab.hk", "investigation@aidlab.hk"} ); - log.info("发送给xupei3360@163.com"); - - SendEmailUtil.commonExceptionReminder( - "Flux账户积分不足,flux生成任务失败", - new String[]{"fangjianliao@aidlab.hk"} - ); - log.info("发送给fangjianliao@aidlab.hk"); - - SendEmailUtil.commonExceptionReminder( - "Flux账户积分不足,flux生成任务失败", - new String[]{"investigation@aidlab.hk"} - ); - log.info("发送给investigation@aidlab.hk"); notified[i] = true; } continue; // 尝试下一个key diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index e8472e3f..02d5f809 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -22,7 +22,7 @@ spring.security.jwtExpiration=604800000 spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\ /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,\ /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR,/api/alipay-hk/**,/api/portfolio/**,\ - /api/stripe/**,/api/message/**,/api/tags/**,/notification/**,/api/affiliate/**,/api/project/**,/api/llm/** + /api/stripe/**,/api/message/**,/api/tags/**,/notification/**,/api/affiliate/**,/api/project/**,/api/llm/**, /api/subscription_plan/** spring.security.authApi=/auth/login @@ -71,15 +71,15 @@ spring.rabbitmq.username=rabbit spring.rabbitmq.password=123456 spring.rabbitmq.virtual-host=/ -spring.redis.host=172.31.11.32 -#spring.redis.host=18.167.251.121 -spring.redis.port=6379 -spring.redis.database=2 -spring.redis.password=Aidlab -spring.redis.lettuce.pool.max-active=8 -spring.redis.lettuce.pool.max-idle=8 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.pool.max-wait=5 +spring.data.redis.host=172.31.11.32 +#spring.data.redis.host=18.167.251.121 +spring.data.redis.port=6379 +spring.data.redis.database=2 +spring.data.redis.password=Aidlab +spring.data.redis.lettuce.pool.max-active=8 +spring.data.redis.lettuce.pool.max-idle=8 +spring.data.redis.lettuce.pool.min-idle=0 +spring.data.redis.lettuce.pool.max-wait=5 redis.key.orderForGenerate=OrderForGenerate redis.key.generateCancelSet=GenerateCancelSet diff --git a/src/main/resources/payment.properties b/src/main/resources/payment.properties index bc57019c..7607c6c6 100644 --- a/src/main/resources/payment.properties +++ b/src/main/resources/payment.properties @@ -34,13 +34,13 @@ paypal.webhook_id=1D107312EX592781K #stripe.webhook-sign-secret=whsec_TJcMSnAkh4uktrNY1M6Iy8XaVze4Rzqm # kim - test -stripe.private-key=sk_test_51LwPrxH7nPZ8bkrNj67TFD7sxucaTANs1lf0KGSu1QSJfxYXcnigq2wTaZyZzST7y0fMbhhvaJZ4LjjFhr95M83a00eXrmOTL0 +#stripe.private-key=sk_test_51LwPrxH7nPZ8bkrNj67TFD7sxucaTANs1lf0KGSu1QSJfxYXcnigq2wTaZyZzST7y0fMbhhvaJZ4LjjFhr95M83a00eXrmOTL0 # prod 端点 #stripe.webhook-sign-secret=whsec_GoyVEAaBtuGD5Rt55z83JnPnLDAZTN3u # local 端点 #stripe.webhook-sign-secret=whsec_NvwM3hDQiN5GXclYOYekE9IKHLjmROF8 # dev 端点 -stripe.webhook-sign-secret=whsec_pX0pPMQm85PaUSWnFMEzoccb3MGNkjoL +#stripe.webhook-sign-secret=whsec_pX0pPMQm85PaUSWnFMEzoccb3MGNkjoL # kim - live #stripe.private-key=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