From ef686e38ac6cccbe8de2918745f4ab058c93f79f Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 19 Dec 2025 17:33:51 +0800 Subject: [PATCH 1/4] CONFIG: TO PROD --- src/main/java/com/ai/da/common/config/MyTaskScheduler.java | 2 +- src/main/java/com/ai/da/common/task/PaymentTask.java | 2 +- src/main/resources/payment.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 60ebdd78..4c4d3828 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/resources/payment.properties b/src/main/resources/payment.properties index 218a2210..f4b98130 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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 From f43099e19e8de82399b2fbf48569609ce2aa3fc3 Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 19 Dec 2025 21:21:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?CONFIG:=20redis=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index e8472e3f..3347e7e1 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -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 From 35edaa0f27a7fadb306ed12179e5d1fbc27ff359 Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 19 Dec 2025 21:43:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?CONFIG:=20=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 3347e7e1..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 From d0ec5c5c2607fa7bfc48b407a0d4fb702e9871f3 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 23 Dec 2025 16:03:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?BUGFIX:=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/utils/SendEmailUtil.java | 2 +- src/main/java/com/ai/da/common/utils/SendRequestUtil.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index 5b789a10..dcdeb4bd 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -1024,7 +1024,7 @@ public class SendEmailUtil { log.info("邮件发送结果res###{}", SendEmailResponse.toJsonString(resp)); } catch (TencentCloudSDKException e) { log.info("邮件发送失败###{}", e.toString()); - throw new BusinessException("failed.to.send.mail"); +// throw new BusinessException("failed.to.send.mail"); } } 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 c58affd0..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,8 +140,8 @@ public class SendRequestUtil { if (status == 402 || status == 403) { if (!notified[i]) { SendEmailUtil.commonExceptionReminder( - "Flux账户积分不足，flux生成任务失败", - new String[]{"xupei3360@163.com, fangjianliao@aidlab.hk, investigation@aidlab.hk"} + "Flux账户积分不足，flux生成任务失败。（key:）" + apiKeys[i], + new String[]{"xupei3360@163.com", "fangjianliao@aidlab.hk", "investigation@aidlab.hk"} ); notified[i] = true; }